From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 8 Apr 2013 02:38:11 +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~89
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e6c32614f3840ac09dad1f7ffc1d4976a76d8fcb;p=openldap

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

e6c32614f3840ac09dad1f7ffc1d4976a76d8fcb