]> git.sur5r.net Git - openldap/commitdiff
projects / openldap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bbbaea 13a8b61)
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Mon, 4 Jan 2016 19:47:16 +0000 (13:47 -0600)
committerQuanah Gibson-Mount <quanah@openldap.org>
Mon, 4 Jan 2016 19:47:16 +0000 (13:47 -0600)

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