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)
commit5e9ca5dcb56df80e9a4142a536425d1931a3c3f6
tree0e8bede4fd12a4a2b99120dbabee61fb20c77569
parent1bcbb3d80ac6d79da697bba113d5864e721e35d7
parent736260e257fcec5ec9d5e66db69960233bf5766e
Merge pull request #3 from collectd/master

merging upstream