From: Quanah Gibson-Mount Date: Fri, 29 Jan 2016 00:48:13 +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=01adc9bd87def657b5f0c4017376b848aeff424a;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 01adc9bd87def657b5f0c4017376b848aeff424a