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

Trivial merge