]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorHoward Chu <hyc@openldap.org>
Fri, 9 Sep 2011 04:42:58 +0000 (21:42 -0700)
committerHoward Chu <hyc@openldap.org>
Fri, 9 Sep 2011 04:42:58 +0000 (21:42 -0700)

Trivial merge