From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 28 Oct 2013 16:25:10 +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=155484eab2dd63162bebced03260be50b885f4ba;p=openldap

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

155484eab2dd63162bebced03260be50b885f4ba