From: Howard Chu <hyc@openldap.org>
Date: Mon, 5 Nov 2012 17:47:03 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~794
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88fd28886d04aef10a0887d1907b7b4dd61b7904;p=thirdparty%2Fopenldap.git

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

88fd28886d04aef10a0887d1907b7b4dd61b7904