From: Howard Chu <hyc@openldap.org>
Date: Wed, 9 Nov 2011 23:36:00 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52a0d000311d7eda3eb830c7bff75286fe7661fc;p=thirdparty%2Fopenldap.git

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

52a0d000311d7eda3eb830c7bff75286fe7661fc