From: Howard Chu <hyc@openldap.org>
Date: Mon, 19 Sep 2011 00:08:40 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=001f14965402aa86f3d7cd364fc781caeb603719;p=thirdparty%2Fopenldap.git

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

001f14965402aa86f3d7cd364fc781caeb603719