From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 13 Aug 2013 20:36:40 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
X-Git-Tag: OPENLDAP_REL_ENG_2_4_36~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3463da548b91cc21d2a26bea404edb48bf0cbc48;p=openldap

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

3463da548b91cc21d2a26bea404edb48bf0cbc48