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