From: Howard Chu <hyc@openldap.org>
Date: Fri, 9 Mar 2012 05:39:01 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1007
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfa8dd6884f7d45154fb92651fd6e04aeb93dd0b;p=thirdparty%2Fopenldap.git

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

cfa8dd6884f7d45154fb92651fd6e04aeb93dd0b