]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorGavin Henry <ghenry@OpenLDAP.org>
Wed, 30 Mar 2011 10:52:20 +0000 (11:52 +0100)
committerGavin Henry <ghenry@OpenLDAP.org>
Wed, 30 Mar 2011 10:52:20 +0000 (11:52 +0100)

Trivial merge