From: Quanah Gibson-Mount Date: Mon, 4 Jan 2016 19:47:16 +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=fead3f8e08ff8d11a44594cc0b03295acc501826;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- fead3f8e08ff8d11a44594cc0b03295acc501826