]> git.sur5r.net Git - openldap/commitdiff
projects / openldap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d85a1a3 42bc6ed)
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5 OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Fri, 14 Apr 2017 19:35:00 +0000 (12:35 -0700)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 14 Apr 2017 19:35:00 +0000 (12:35 -0700)

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