s3-torture: run_locktest1(): replace cli_lock() with cli_lock32()
[obnox/samba/samba-obnox.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.