Code

Merge remote-tracking branch 'github/pr/387' master
authorFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 07:40:26 +0000 (09:40 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 07:40:26 +0000 (09:40 +0200)

Trivial merge