From: Florian Forster <octo@collectd.org>
Date: Thu, 11 Jun 2015 06:50:12 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cedb6f147e94d0e952449f731313412ef4d67904;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

cedb6f147e94d0e952449f731313412ef4d67904