From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 14 Oct 2013 16:04:34 +0000 (-0700)
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=9f582c6200ff04c269a5da6ff7744b30b7e8967b;p=openldap

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

9f582c6200ff04c269a5da6ff7744b30b7e8967b