From: Howard Chu <hyc@openldap.org>
Date: Wed, 13 Mar 2013 00:34:40 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~694
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=334ca55089483898ed70ed0794e8cde32169a13d;p=thirdparty%2Fopenldap.git

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

334ca55089483898ed70ed0794e8cde32169a13d