Merge pull request #3 from collectd/master
authorbbczeuz <githubmail@zeuz.ch>
Sun, 6 Sep 2015 12:58:44 +0000 (14:58 +0200)
committerbbczeuz <githubmail@zeuz.ch>
Sun, 6 Sep 2015 12:58:44 +0000 (14:58 +0200)
merging upstream


Trivial merge