From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 5 Nov 2013 19:15:14 +0000 (-0800)
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=ebf4dc7396f4353d45d80652dcb395b7c2977a23;p=openldap

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

ebf4dc7396f4353d45d80652dcb395b7c2977a23