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

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

d377f353b7053bbe17afa8d97e2eacf810ec3086