From: bbczeuz <githubmail@zeuz.ch>
Date: Sun, 13 Sep 2015 22:10:44 +0000 (+0200)
Subject: Merge pull request #4 from collectd/master
X-Git-Tag: collectd-5.6.0~258^2~17^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7553f3912f28f356018eb807709856b9ebf7d376;p=collectd.git

Merge pull request #4 from collectd/master

sync with upstream
---

7553f3912f28f356018eb807709856b9ebf7d376