From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 7 Jan 2014 23:44:34 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
X-Git-Tag: OPENLDAP_REL_ENG_2_4_39~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=503561bdc10474838052985ca3305e8987a0d76f;p=openldap

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

503561bdc10474838052985ca3305e8987a0d76f