From: Howard Chu <hyc@openldap.org>
Date: Thu, 26 Jul 2012 14:25:07 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~882
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e3fa1ee145215f6cf63decc11a2da949be0eea0;p=thirdparty%2Fopenldap.git

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

0e3fa1ee145215f6cf63decc11a2da949be0eea0