From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 22 Aug 2014 20:23:10 +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=ea6a80e2b0a7c8b9e9229573adc39713f54c4126;p=openldap

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

ea6a80e2b0a7c8b9e9229573adc39713f54c4126