From: Claudius Zingerli <githubmail@zeuz.ch>
Date: Fri, 29 Apr 2016 14:29:53 +0000 (+0200)
Subject: Merge pull request #8 from collectd/master
X-Git-Tag: collectd-5.6.0~258^2~16
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=441e067a2d5a294517bd87ca45c87fd67377d2cf;p=collectd.git

Merge pull request #8 from collectd/master

Sync with upstream
---

441e067a2d5a294517bd87ca45c87fd67377d2cf