]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorKurt Zeilenga <kurt@OpenLDAP.org>
Tue, 29 Mar 2011 01:42:22 +0000 (18:42 -0700)
committerKurt Zeilenga <kurt.zeilenga@isode.com>
Tue, 29 Mar 2011 01:42:22 +0000 (18:42 -0700)

Trivial merge