Code

Merge branch 'pr/1033'
authorFlorian Forster <octo@collectd.org>
Sat, 6 Jun 2015 19:39:16 +0000 (21:39 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 6 Jun 2015 19:39:16 +0000 (21:39 +0200)

Trivial merge