From: Quanah Gibson-Mount Date: Thu, 28 Jan 2016 03:51:52 +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=5b8fdcbb50e09dcafe9e6cd3d16b5542c2272769;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 5b8fdcbb50e09dcafe9e6cd3d16b5542c2272769