Code

Merge remote-tracking branch 'github/pr/1930'
authorFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 19:42:07 +0000 (21:42 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 19:42:07 +0000 (21:42 +0200)

Trivial merge