Code

Merge pull request #5 from collectd/master
authorbbczeuz <githubmail@zeuz.ch>
Fri, 18 Dec 2015 10:28:14 +0000 (11:28 +0100)
committerbbczeuz <githubmail@zeuz.ch>
Fri, 18 Dec 2015 10:28:14 +0000 (11:28 +0100)
merging upstream


Trivial merge