From: Quanah Gibson-Mount Date: Tue, 17 Jan 2017 17:30:41 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ff616fa982b975bb7542251c89aff998948e1ddf;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- ff616fa982b975bb7542251c89aff998948e1ddf