From: Quanah Gibson-Mount Date: Wed, 18 Jan 2017 20:45:29 +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=7b871232fa96b73eb2929d351b3c99a563dab9b5;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 7b871232fa96b73eb2929d351b3c99a563dab9b5