From: Howard Chu <hyc@openldap.org>
Date: Wed, 25 Jul 2012 19:32:28 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~883
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4317c7ce54ceb41d57e6ec83f547edfaeedb574b;p=thirdparty%2Fopenldap.git

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

4317c7ce54ceb41d57e6ec83f547edfaeedb574b