From: Quanah Gibson-Mount Date: Tue, 29 Nov 2016 17:38:04 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c883612ed0e04ce3c6b6d97ae0a0fc5e08bbcc53;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- c883612ed0e04ce3c6b6d97ae0a0fc5e08bbcc53