From: Howard Chu <hyc@openldap.org>
Date: Fri, 16 Aug 2013 13:44:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~608
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9121a473dece0cabeac334a373b765508a47c1fc;p=thirdparty%2Fopenldap.git

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

9121a473dece0cabeac334a373b765508a47c1fc