Fix commit d07cd37b993d3c9beded20323174633b806196b5
[abartlet/samba.git/.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.