s3-param: Rename lp_dns_proxy() -> lp_wins_dns_proxy() for clarity
[amitay/samba.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.