Merge remote-tracking branch 'origin/v4-1-test' into master
authorStefan Metzmacher <metze@samba.org>
Fri, 5 Jul 2013 10:07:53 +0000 (12:07 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 5 Jul 2013 10:33:34 +0000 (12:33 +0200)
commita0130c662a40d6951fadae4bd9a6f7c230df05db
treebf54db9466de8bb3c0916344145ee3f8f0bc7c41
parentaf6d9cebaf3bc4b564952e445af035fe8aece662
parente56343f1bba603852afcb816f7b5ebdf680c182e
Merge remote-tracking branch 'origin/v4-1-test' into master

git merge -s ours origin/v4-1-test

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