From: Quanah Gibson-Mount Date: Mon, 9 Nov 2015 01:13:14 +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=72ea167b17923dffc104f478ebf478aec789b4c1;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 72ea167b17923dffc104f478ebf478aec789b4c1