]> git.ipfire.org Git - thirdparty/openldap.git/commitdiff
projects / thirdparty / openldap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 118a14f 76d9be0)
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
Mirror of https://git.openldap.org/openldap/openldap.git