]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' into mdb
authorHoward Chu <hyc@openldap.org>
Tue, 23 Aug 2011 20:51:25 +0000 (13:51 -0700)
committerHoward Chu <hyc@openldap.org>
Tue, 23 Aug 2011 20:51:25 +0000 (13:51 -0700)

Trivial merge