From: Howard Chu <hyc@openldap.org>
Date: Mon, 12 Sep 2011 06:58:50 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f1522418ebb621affa4aa819c7e4241deb4f015;p=thirdparty%2Fopenldap.git

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

0f1522418ebb621affa4aa819c7e4241deb4f015