From: Quanah Gibson-Mount Date: Wed, 18 Jan 2017 15:58:53 +0000 (-0800) Subject: Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=7d4a51505f4054c3b43d4a42005f7d58cc95a4bc Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 7d4a51505f4054c3b43d4a42005f7d58cc95a4bc