Code

Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
authorFlorian Forster <octo@collectd.org>
Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)

Trivial merge