From: Howard Chu <hyc@openldap.org>
Date: Thu, 8 Sep 2011 06:58:29 +0000 (-0700)
Subject: Merge remote branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1227^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cba0d05a9dfd3cad69380e3ee2b492ddd7c7ca84;p=thirdparty%2Fopenldap.git

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

cba0d05a9dfd3cad69380e3ee2b492ddd7c7ca84