Merge remote-tracking branch 'github/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Fri, 30 Nov 2012 06:22:11 +0000 (07:22 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 30 Nov 2012 06:22:11 +0000 (07:22 +0100)

Trivial merge