Fix bug 6514: net gives unhelpful "lp_load failed" when it's missing smb.conf
[metze/samba/wip.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.