Merge remote-tracking branch 'github/pr/1088' into collectd-5.4
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)

Trivial merge