From: Howard Chu <hyc@openldap.org>
Date: Thu, 23 Aug 2012 06:02:48 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~839
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67dd10ed2c334e38c2adf084f2688609ac05134e;p=thirdparty%2Fopenldap.git

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

67dd10ed2c334e38c2adf084f2688609ac05134e