Merge 'origin/v4-10-stable' into the real 4.10.4 release
commitdef2c7dabc9d538587a39a3bf75605d8fd89b974
authorKarolin Seeger <kseeger@samba.org>
Wed, 22 May 2019 10:14:55 +0000 (22 12:14 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 22 May 2019 10:14:55 +0000 (22 12:14 +0200)
tree5d14c653b91ad09709c8cd3b0f4bdbd22db6fbf7
parentfa9de54681bc2ebfb37b43f2a7bd2d69124f24c7
parent8eb462bf914f9b8f9427ececbfc15ae8ae4e5b72
Merge 'origin/v4-10-stable' into the real 4.10.4 release

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