From: Quanah Gibson-Mount Date: Wed, 9 Sep 2015 23:48:26 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a6f1c6bd86cbf9bd4ca8e9a96320064886457c6f;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- a6f1c6bd86cbf9bd4ca8e9a96320064886457c6f