From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 8 Jul 2014 22:22:20 +0000 (-0500)
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=f1f8078973c1c9f2af85abfe72e1ad23f41c81d8;p=openldap

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

f1f8078973c1c9f2af85abfe72e1ad23f41c81d8