From: Howard Chu <hyc@openldap.org>
Date: Fri, 19 Jul 2013 17:02:24 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~636
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96bf741367d899d54490727c4962490045620f75;p=thirdparty%2Fopenldap.git

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

96bf741367d899d54490727c4962490045620f75