]> 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, 5 Feb 2016 23:56:54 +0000 (17:56 -0600)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 5 Feb 2016 23:56:54 +0000 (17:56 -0600)

Trivial merge