]> git.sur5r.net Git - openldap/commitdiff
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
authorQuanah Gibson-Mount <quanah@openldap.org>
Tue, 8 Jul 2014 22:22:36 +0000 (17:22 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 8 Jul 2014 22:22:36 +0000 (17:22 -0500)

Trivial merge