From: Howard Chu <hyc@openldap.org>
Date: Mon, 9 Jul 2012 15:44:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~895
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=113538806ffcdd83da45ad39d0ab54d515ffb1ae;p=thirdparty%2Fopenldap.git

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

113538806ffcdd83da45ad39d0ab54d515ffb1ae