From: Howard Chu <hyc@openldap.org>
Date: Mon, 27 Aug 2012 21:45:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~834
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7dd1bdb82702a32421e525cd8f7bc69802b1852;p=thirdparty%2Fopenldap.git

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

d7dd1bdb82702a32421e525cd8f7bc69802b1852