From: Florian Forster <octo@collectd.org>
Date: Wed, 17 Jun 2015 12:52:22 +0000 (+0200)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.1~109
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f5adf265a374e5e0dba89a4a9903e7719dc57039;p=collectd.git

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

f5adf265a374e5e0dba89a4a9903e7719dc57039