From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 17 May 2013 00:54:07 +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~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a9c945899cf839e0ad3015b3aa5b82c5b2b0d665;p=openldap

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

a9c945899cf839e0ad3015b3aa5b82c5b2b0d665