]> 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>
Sat, 13 Sep 2014 21:25:16 +0000 (16:25 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Sat, 13 Sep 2014 21:25:16 +0000 (16:25 -0500)

Trivial merge