From: Quanah Gibson-Mount Date: Fri, 5 Feb 2016 21:30:28 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a7ba741ff7164dea4e1fbebe48f55d3c95c1c905;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- a7ba741ff7164dea4e1fbebe48f55d3c95c1c905