From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 12 Feb 2015 17:30:00 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/mdb.RE/0.9'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~141^2~97
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c127e78fb0c802852f6ca17ced416a33ef3e842e;p=thirdparty%2Fopenldap.git

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

c127e78fb0c802852f6ca17ced416a33ef3e842e