From: Quanah Gibson-Mount Date: Wed, 11 Nov 2015 16:24:18 +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=61191d8ff8ef11a981ac0746888fca2a18c3e587;p=openldap Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 --- 61191d8ff8ef11a981ac0746888fca2a18c3e587