From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 16 Dec 2014 08:01:33 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/mdb.RE/0.9'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~141^2~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef95ee1755615b44fa6417cd7238dea3fbeb6742;p=thirdparty%2Fopenldap.git

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

ef95ee1755615b44fa6417cd7238dea3fbeb6742