Merge tag 'samba-4.1.6' into v4-1-test
commit71eade3f8f2e6196fb839259e1467c9223086489
authorStefan Metzmacher <metze@samba.org>
Tue, 11 Mar 2014 19:50:47 +0000 (11 20:50 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 11 Mar 2014 19:50:47 +0000 (11 20:50 +0100)
tree4e9dff90161bffdb6ac40787ad1a9111dba22781
parent1cd273eeabe765e0be8c7dd056dd537c0ea30b08
parent48966b660733c9c9726cc3a87fa670b4c8427f5a
Merge tag 'samba-4.1.6' into v4-1-test

Signed-off-by: Stefan Metzmacher <metze@samba.org>