]> 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, 8 Oct 2013 16:06:45 +0000 (09:06 -0700)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 8 Oct 2013 16:06:45 +0000 (09:06 -0700)

Trivial merge