Merge remote-tracking branch 'github/pr/1939'
authorFlorian Forster <octo@collectd.org>
Mon, 19 Sep 2016 14:13:08 +0000 (16:13 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 19 Sep 2016 14:13:08 +0000 (16:13 +0200)

Trivial merge