Code

Merge remote-tracking branch 'github/pr/1097'
authorFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:37:20 +0000 (22:37 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:37:20 +0000 (22:37 +0200)

Trivial merge