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

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