Revert "s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4"
[amitay/samba.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.