]> 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>
Thu, 26 Jul 2012 23:15:31 +0000 (16:15 -0700)
committerQuanah Gibson-Mount <quanah@openldap.org>
Thu, 26 Jul 2012 23:15:31 +0000 (16:15 -0700)
1  2 
CHANGES

diff --cc CHANGES
Simple merge