]> git.sur5r.net Git - openldap/commitdiff
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 OPENLDAP_REL_ENG_2_4_40
authorQuanah Gibson-Mount <quanah@openldap.org>
Fri, 19 Sep 2014 01:48:49 +0000 (20:48 -0500)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 19 Sep 2014 01:48:49 +0000 (20:48 -0500)

Trivial merge