From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 24 Oct 2013 23:25:23 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=14133d5e3d1cd83828743965eecfdfa22e20cee0;p=openldap

Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_5
---

14133d5e3d1cd83828743965eecfdfa22e20cee0