From: Quanah Gibson-Mount Date: Thu, 8 Dec 2016 17:05:46 +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=11b2df5c1bb56cd6fe1b663e47a122782f65f97e;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 11b2df5c1bb56cd6fe1b663e47a122782f65f97e