From: Howard Chu <hyc@openldap.org>
Date: Fri, 11 Nov 2011 20:50:12 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=122fa3a89538cefba69eb2c9fc7a43f62b9e3733;p=thirdparty%2Fopenldap.git

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

122fa3a89538cefba69eb2c9fc7a43f62b9e3733