From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 18 Aug 2014 05:00:26 +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=928b0a9ce5b2cfa7070f3b9c95bb38c6f0612dd6;p=openldap

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

928b0a9ce5b2cfa7070f3b9c95bb38c6f0612dd6