]> 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, 5 Nov 2013 19:15:14 +0000 (11:15 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Tue, 5 Nov 2013 19:15:14 +0000 (11:15 -0800)

Trivial merge