From: Howard Chu <hyc@openldap.org>
Date: Fri, 12 Jul 2013 20:23:45 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~640
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79ac4cb36184570cc4fbcdbb328240ef37a4aeae;p=thirdparty%2Fopenldap.git

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

79ac4cb36184570cc4fbcdbb328240ef37a4aeae