From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 18 Oct 2013 20:38:24 +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~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=632b6e00eb3d18191d420c015eec7dcfcb5457a4;p=openldap

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

632b6e00eb3d18191d420c015eec7dcfcb5457a4