From: Quanah Gibson-Mount Date: Mon, 27 Jun 2011 21:49:19 +0000 (-0700) Subject: Merge branch 'OPENLDAP_REL_ENG_2_4' of ssh://git-master.openldap.org/~git/git/openlda... X-Git-Tag: OPENLDAP_REL_ENG_2_4_26~4 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ad57aa2a132804356c67c152d10f0b66384d9ded;p=openldap Merge branch 'OPENLDAP_REL_ENG_2_4' of ssh://git-master.openldap.org/~git/git/openldap into OPENLDAP_REL_ENG_2_4 --- ad57aa2a132804356c67c152d10f0b66384d9ded