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