From: Howard Chu <hyc@openldap.org>
Date: Thu, 18 Sep 2014 01:12:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~141^2~208
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdcf70eeb6b863d4d135ccb010da7f69e52b6723;p=thirdparty%2Fopenldap.git

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

cdcf70eeb6b863d4d135ccb010da7f69e52b6723