From: Howard Chu <hyc@openldap.org>
Date: Thu, 1 Sep 2011 23:50:26 +0000 (-0700)
Subject: Merge remote branch 'mdb4/master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02cff39398a62956aa3a86b834fb317415ccc601;p=thirdparty%2Fopenldap.git

Merge remote branch 'mdb4/master'
---

02cff39398a62956aa3a86b834fb317415ccc601