Code

Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Oct 2012 10:49:44 +0000 (12:49 +0200)

Trivial merge