socket_wrapper: also ignore AF_INET6 in swrap_setsockopt()
[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.