From: Quanah Gibson-Mount Date: Thu, 6 Apr 2017 22:15:17 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5104bbeb657a7ce8fe2745ee09b02785333f6a61;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 5104bbeb657a7ce8fe2745ee09b02785333f6a61