From: Howard Chu <hyc@openldap.org>
Date: Sat, 10 Aug 2013 12:05:57 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~618
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=634dcb507e57c46c16bb2a1bfcc8aea0d6c88d2b;p=thirdparty%2Fopenldap.git

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

634dcb507e57c46c16bb2a1bfcc8aea0d6c88d2b