Code

Merge remote-tracking branch 'origin/master'
authorFlorian Forster <octo@collectd.org>
Fri, 20 Sep 2013 13:32:27 +0000 (15:32 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 20 Sep 2013 13:32:27 +0000 (15:32 +0200)

Trivial merge