From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 18 Aug 2014 05:00:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=471bdb44c2beeb0ce012d597930b109bf599a232;p=openldap

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

471bdb44c2beeb0ce012d597930b109bf599a232