Merge pull request #6 from collectd/master
authorClaudius Zingerli <githubmail@zeuz.ch>
Wed, 20 Jan 2016 15:15:34 +0000 (16:15 +0100)
committerClaudius Zingerli <githubmail@zeuz.ch>
Wed, 20 Jan 2016 15:15:34 +0000 (16:15 +0100)
commitd8f6c4d40e4f19be0cfac41593f44b75685f3f0b
treedda9d07bbb515e063a6fe565b05588d495d55745
parentb1b0aa549005c62b0e4651053198693e33ea84f0
parent9c8f3110063cf83fa146929d5f28f8ecf17a4ffd
Merge pull request #6 from collectd/master

merging from upstream