s3:smbd/globals: change 'int am_parent' into 'struct smbd_parent_context *am_parent'
[kai/samba.git] / merged-branches.txt
2008-09-14 Stefan MetzmacherMerge Samba3 and Samba4 together
2008-09-11 Stefan Metzmacherprepare merging Samba3 and Samba4 together.