From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 2 Dec 2013 17:50:38 +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=c3d84bcd06d0017a7fad5f1d7932c590605e6369;p=openldap

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

c3d84bcd06d0017a7fad5f1d7932c590605e6369