Code

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

Trivial merge