]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorQuanah Gibson-Mount <quanah@openldap.org>
Wed, 16 Jan 2013 08:13:40 +0000 (00:13 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Wed, 16 Jan 2013 08:13:40 +0000 (00:13 -0800)

Trivial merge