From: Quanah Gibson-Mount Date: Sun, 15 Jan 2017 23:13:31 +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=90f8a00e2663234a8309ab48bbc7c29e8e8684a6;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 90f8a00e2663234a8309ab48bbc7c29e8e8684a6