From: Quanah Gibson-Mount Date: Thu, 29 Oct 2015 20:51:19 +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=c68f16cfcc062d36c18ccf8d18180747440ece57;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- c68f16cfcc062d36c18ccf8d18180747440ece57