From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 15 Jan 2014 02:33:50 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
X-Git-Tag: OPENLDAP_REL_ENG_2_4_39~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0ee07cee213c85a5c3f54b935a137eea6b34c76f;p=openldap

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

0ee07cee213c85a5c3f54b935a137eea6b34c76f