From: Quanah Gibson-Mount Date: Wed, 28 Oct 2015 16:01:57 +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=ca4b13a5a7439fdb7050efd0bde3d4fdbb81ddb7;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- ca4b13a5a7439fdb7050efd0bde3d4fdbb81ddb7