From: bbczeuz <githubmail@zeuz.ch>
Date: Mon, 20 Jul 2015 02:44:44 +0000 (+0200)
Subject: Merge pull request #2 from collectd/master
X-Git-Tag: collectd-5.6.0~258^2~17^2~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=1bcbb3d80ac6d79da697bba113d5864e721e35d7;p=collectd.git

Merge pull request #2 from collectd/master

Update from original2
---

1bcbb3d80ac6d79da697bba113d5864e721e35d7