From: Quanah Gibson-Mount Date: Fri, 13 Nov 2015 16:08:24 +0000 (-0600) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5f36b67ef0d8b7db9138f9d39d4d458a23160352;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 5f36b67ef0d8b7db9138f9d39d4d458a23160352