Merge pull request #2 from collectd/master
authorbbczeuz <githubmail@zeuz.ch>
Mon, 20 Jul 2015 02:44:44 +0000 (04:44 +0200)
committerbbczeuz <githubmail@zeuz.ch>
Mon, 20 Jul 2015 02:44:44 +0000 (04:44 +0200)
Update from original2


Trivial merge