From: Quanah Gibson-Mount Date: Tue, 3 Jan 2017 20:37:14 +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=a1e0cb0a1fd8e52194b681d2331df76dddfb420a;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- a1e0cb0a1fd8e52194b681d2331df76dddfb420a