From: Quanah Gibson-Mount Date: Fri, 14 Apr 2017 19:35:00 +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=refs%2Fheads%2FOPENLDAP_REL_ENG_2_5;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- faef29309daabfc3ec5079600a588b8eb7e21c1a