s4-s3-upgrade Fix samba3upgrade code to cope with a missing wins.dat
[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.