From: Quanah Gibson-Mount Date: Thu, 19 Jan 2017 18:57:26 +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=7ae6ec8b29432ef4a32aa7cea7a0c153096f6240;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 7ae6ec8b29432ef4a32aa7cea7a0c153096f6240