]> git.sur5r.net Git - openldap/commitdiff
Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4 OPENLDAP_REL_ENG_2_4_36
authorQuanah Gibson-Mount <quanah@openldap.org>
Fri, 16 Aug 2013 18:12:59 +0000 (11:12 -0700)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 16 Aug 2013 18:12:59 +0000 (11:12 -0700)

Trivial merge