s3:smbd/server: move smbd_open_socket and smbd_parent_context to the top
[kai/samba.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.