From: Howard Chu <hyc@openldap.org>
Date: Wed, 7 Mar 2012 06:17:19 +0000 (-0800)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1013
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ce2a2aee611726aa763234469d6849d2113044f;p=thirdparty%2Fopenldap.git

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

5ce2a2aee611726aa763234469d6849d2113044f