s4:selftest: avoid running the slow BASE-DELAY-WRITE test on the cifs proxy share
[gd/samba/.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.