]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorQuanah Gibson-Mount <quanah@openldap.org>
Fri, 13 Jun 2014 17:54:40 +0000 (12:54 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 13 Jun 2014 17:54:40 +0000 (12:54 -0500)

Trivial merge