From: bbczeuz <githubmail@zeuz.ch>
Date: Sun, 6 Sep 2015 12:58:44 +0000 (+0200)
Subject: Merge pull request #3 from collectd/master
X-Git-Tag: collectd-5.6.0~258^2~17^2~4
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5e9ca5dcb56df80e9a4142a536425d1931a3c3f6;p=collectd.git

Merge pull request #3 from collectd/master

merging upstream
---

5e9ca5dcb56df80e9a4142a536425d1931a3c3f6