From: Howard Chu <hyc@openldap.org>
Date: Fri, 24 Aug 2012 12:34:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~837
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f980c64cb63abca0928e176a9443d8513b74ef74;p=thirdparty%2Fopenldap.git

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

f980c64cb63abca0928e176a9443d8513b74ef74