]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Sun, 23 Sep 2012 10:22:37 +0000 (12:22 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 23 Sep 2012 10:22:37 +0000 (12:22 +0200)

Trivial merge