]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorQuanah Gibson-Mount <quanah@openldap.org>
Tue, 29 May 2012 23:09:31 +0000 (16:09 -0700)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 29 May 2012 23:09:31 +0000 (16:09 -0700)

Trivial merge