From: Howard Chu <hyc@openldap.org>
Date: Mon, 29 Jul 2013 00:13:04 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~634
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f4590f110bea406dd09e8fff5caea832274fa61;p=thirdparty%2Fopenldap.git

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

4f4590f110bea406dd09e8fff5caea832274fa61