From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 15 Jan 2014 02:33:32 +0000 (-0600)
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=b5f21213cabc772663eb39f75ca25f8f7f68d4f9;p=openldap

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

b5f21213cabc772663eb39f75ca25f8f7f68d4f9