From: Howard Chu <hyc@openldap.org>
Date: Wed, 9 May 2012 05:19:05 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~942
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff1839ebe653816679794a8c84ada71009b3314c;p=thirdparty%2Fopenldap.git

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

ff1839ebe653816679794a8c84ada71009b3314c