Code

Merge branch 'collectd-5.3'
authorFlorian Forster <octo@collectd.org>
Fri, 12 Jul 2013 16:23:20 +0000 (18:23 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 12 Jul 2013 16:23:20 +0000 (18:23 +0200)
Conflicts:
src/collectd.conf.pod


No differences found