tsocket/bsd: fix bug #7140 autodetect ipv4 and ipv6 based on the remote address if...
[abartlet/samba.git/.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.