From: Howard Chu <hyc@openldap.org>
Date: Tue, 15 Nov 2011 00:22:51 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40477fae4e034185a92f672c3b6a4ed217cfade0;p=thirdparty%2Fopenldap.git

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

40477fae4e034185a92f672c3b6a4ed217cfade0