Merge tag 'samba-4.2.14' into v4-2-test
authorKarolin Seeger <kseeger@samba.org>
Thu, 7 Jul 2016 09:23:50 +0000 (11:23 +0200)
committerKarolin Seeger <kseeger@samba.org>
Thu, 7 Jul 2016 09:23:50 +0000 (11:23 +0200)
samba: tag samba-4.2.14


Trivial merge