From: Howard Chu <hyc@openldap.org>
Date: Fri, 7 Sep 2012 20:42:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~831
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c56ede77811f6d43733f2ece24a053cdf8c642c2;p=thirdparty%2Fopenldap.git

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

c56ede77811f6d43733f2ece24a053cdf8c642c2