From: Claudius Zingerli <githubmail@zeuz.ch>
Date: Wed, 20 Jan 2016 15:15:34 +0000 (+0100)
Subject: Merge pull request #6 from collectd/master
X-Git-Tag: collectd-5.6.0~258^2~17^2~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d8f6c4d40e4f19be0cfac41593f44b75685f3f0b;p=collectd.git

Merge pull request #6 from collectd/master

merging from upstream
---

d8f6c4d40e4f19be0cfac41593f44b75685f3f0b