]> 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, 30 Jan 2012 18:17:44 +0000 (10:17 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Mon, 30 Jan 2012 18:17:44 +0000 (10:17 -0800)

Trivial merge