From: Howard Chu <hyc@openldap.org>
Date: Wed, 31 Jul 2013 15:14:39 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~626
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45792bc59230fcb03d9f0fbaebb66697e711591b;p=thirdparty%2Fopenldap.git

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

45792bc59230fcb03d9f0fbaebb66697e711591b