s4:fix the build after 380874ef863866c94c999ef53252b9d30df65e88
[metze/samba/wip.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.