Revert 9a5ae8edd6d006c078b3af8fdfd84677a63276b1.
[ira/wip.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.