From: Quanah Gibson-Mount Date: Fri, 21 Aug 2015 03:03:58 +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=a9041f81d0465975a1178d4bb3f893d635b3ad49;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- a9041f81d0465975a1178d4bb3f893d635b3ad49