From: Quanah Gibson-Mount Date: Fri, 7 Apr 2017 20:49:55 +0000 (-0700) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2fe93270d4c70b4b535bc7d59a26b0b1e301f3e6;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 2fe93270d4c70b4b535bc7d59a26b0b1e301f3e6