From: Quanah Gibson-Mount Date: Tue, 29 Sep 2015 21:05: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=4ef6520b4d6fe466c2e348e0ce8da523355e592b;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 4ef6520b4d6fe466c2e348e0ce8da523355e592b