Merge branch 'v4-6-stable' into v4-6-test
authorStefan Metzmacher <metze@samba.org>
Wed, 12 Jul 2017 11:32:22 +0000 (13:32 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 12 Jul 2017 11:32:22 +0000 (13:32 +0200)
commitb528634c8376f52392dab5b5faf9980f390810fd
treed560989756eab64f0b5dbc820145fc2a0042f25a
parent05782d5cc0ed8bacac9fe8b254bd0da543010b99
parent55d71509595075a17eb2baf0d89c4801ba2f03f3
Merge branch 'v4-6-stable' into v4-6-test