From: Quanah Gibson-Mount Date: Wed, 28 Dec 2016 18:44:24 +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=97e5f6ddacf34ace98a4343b8ec1d9be22d06f2e;hp=-c;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 97e5f6ddacf34ace98a4343b8ec1d9be22d06f2e