Code

Merge remote-tracking branch 'github/pr/1419'
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:55:10 +0000 (08:55 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:55:10 +0000 (08:55 +0100)

Trivial merge