From: Quanah Gibson-Mount Date: Mon, 26 Oct 2015 20:35:12 +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=6c7205045e978a2a153fab2749d862cbcf71540e;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 6c7205045e978a2a153fab2749d862cbcf71540e