From: Quanah Gibson-Mount Date: Sun, 30 Aug 2015 21:22:59 +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=295253653ce0df194371034500711fafa66dddab;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 295253653ce0df194371034500711fafa66dddab