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)
commite3be923b52ce63d64a292b483f5cddcfbb8a90c7
tree8eab868824f7b1133f38b61fb2c26836cfe21dda
parentc32d2de98c099c6707ad3314ea14d1de2358615d
parentc7c5fe127366aa8edb69247f80a4e015969cf1b3
Merge tag 'samba-4.2.14' into v4-2-test

samba: tag samba-4.2.14