From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 17 Dec 2014 19:21:24 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/mdb.RE/0.9'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~141^2~176
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bae699bfd925327f424d4fddd852356a9b51bc8e;p=thirdparty%2Fopenldap.git

Merge remote-tracking branch 'origin/mdb.RE/0.9'
---

bae699bfd925327f424d4fddd852356a9b51bc8e