Merge pull request #1 from collectd/master
authorbbczeuz <githubmail@zeuz.ch>
Mon, 25 May 2015 17:49:33 +0000 (19:49 +0200)
committerbbczeuz <githubmail@zeuz.ch>
Mon, 25 May 2015 17:49:33 +0000 (19:49 +0200)
Update from original


Trivial merge