]> 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>
Wed, 18 Jun 2014 21:27:27 +0000 (16:27 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Wed, 18 Jun 2014 21:27:27 +0000 (16:27 -0500)

Trivial merge