Second part of the fix for bug #5903 - vfs_streams_xattr breaks contents of the file
[jra/samba/.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.