Code

Merge remote-tracking branch 'github/pr/1397'
authorFlorian Forster <octo@collectd.org>
Thu, 3 Dec 2015 06:14:15 +0000 (07:14 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 3 Dec 2015 06:14:15 +0000 (07:14 +0100)

Trivial merge