]> git.sur5r.net Git - openldap/commitdiff
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Sat, 14 Jan 2017 19:46:23 +0000 (11:46 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Sat, 14 Jan 2017 19:46:23 +0000 (11:46 -0800)

Trivial merge