Revert commit "0551284dc08eb93ef7b2b2227a45e5ec21d482fb" - simplify
[samba.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.