]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'OPENLDAP_REL_ENG_2_4' of ssh://git-master.openldap.org/~git/git/openlda...
authorQuanah Gibson-Mount <quanah@openldap.org>
Mon, 27 Jun 2011 21:49:19 +0000 (14:49 -0700)
committerQuanah Gibson-Mount <quanah@openldap.org>
Mon, 27 Jun 2011 21:49:19 +0000 (14:49 -0700)

Trivial merge