Merge remote-tracking branch 'origin/collectd-5.2' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 27 Jan 2013 13:35:25 +0000 (14:35 +0100)

Trivial merge