]> git.sur5r.net Git - openldap/commitdiff
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
authorQuanah Gibson-Mount <quanah@openldap.org>
Wed, 28 Oct 2015 16:01:57 +0000 (11:01 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Wed, 28 Oct 2015 16:01:57 +0000 (11:01 -0500)

Trivial merge