]> git.sur5r.net Git - openldap/commitdiff
projects / openldap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ae6ec8 5497a7d)
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Fri, 20 Jan 2017 01:04:46 +0000 (17:04 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 20 Jan 2017 01:04:46 +0000 (17:04 -0800)

Trivial merge
Cloned from git://git.openldap.org/openldap.git