]> git.sur5r.net Git - openldap/commit
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)
commitfaef29309daabfc3ec5079600a588b8eb7e21c1a
treef9d6dd32269f54d2dc283e57fc0aa1072df4743f
parentd85a1a326095e6098acd08c93232d734464371b4
parent42bc6ed9914361861b4df4d0bddf9233a2f7fe65
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5