s4-netlogon: Revert patch f02e4ebfafa6e5911e3fe744b1780527ab12c970
[mat/samba.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.