Code

Merge branch 'collectd-5.0' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:09 +0000 (12:41 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:09 +0000 (12:41 +0100)

Trivial merge