From: Quanah Gibson-Mount Date: Thu, 4 Feb 2016 17:39:46 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31edd3013fb9f7d59339ee72608503425c4256e2;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 31edd3013fb9f7d59339ee72608503425c4256e2