]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorHoward Chu <hyc@openldap.org>
Tue, 15 Jan 2013 00:51:29 +0000 (16:51 -0800)
committerHoward Chu <hyc@openldap.org>
Tue, 15 Jan 2013 00:51:29 +0000 (16:51 -0800)

Trivial merge