From: Quanah Gibson-Mount Date: Mon, 24 Aug 2015 02:41:18 +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=5f24e46fb5fa3bd1ee480e5f422c7db01f0c9cc4;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 5f24e46fb5fa3bd1ee480e5f422c7db01f0c9cc4