From: Howard Chu <hyc@openldap.org>
Date: Wed, 4 Apr 2012 12:52:45 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~977
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04c44f016c70fa81cdc01c26866adaca7e5def3e;p=thirdparty%2Fopenldap.git

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

04c44f016c70fa81cdc01c26866adaca7e5def3e