From: Howard Chu <hyc@openldap.org>
Date: Tue, 15 Jan 2013 00:51:37 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~741
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3345a21e027a710829fce527d6a6056e737f1df;p=thirdparty%2Fopenldap.git

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

b3345a21e027a710829fce527d6a6056e737f1df