s4-ipv6: removed the old unused ipv6 code in dcerpc_sock.c
[ira/wip.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.