]> git.sur5r.net Git - openldap/commitdiff
projects / openldap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 373150b 32f9754)
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Tue, 22 Sep 2015 23:26:32 +0000 (18:26 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 22 Sep 2015 23:26:32 +0000 (18:26 -0500)

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