Revert "Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentatio...
[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.