From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 8 Oct 2013 16:06:35 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
X-Git-Tag: OPENLDAP_REL_ENG_2_4_37~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=778024e013cb19b5ada7816367241e4bc1ecb016;p=openldap

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

778024e013cb19b5ada7816367241e4bc1ecb016