]> 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>
Mon, 11 Aug 2014 18:45:00 +0000 (13:45 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Mon, 11 Aug 2014 18:45:00 +0000 (13:45 -0500)

Trivial merge