From: Howard Chu <hyc@openldap.org>
Date: Wed, 14 Sep 2011 18:46:40 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8917b774f71562cdfaaddd7641889ab79ef95273;p=thirdparty%2Fopenldap.git

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

8917b774f71562cdfaaddd7641889ab79ef95273