Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 3 Oct 2008 11:35:45 +0000 (13:35 +0200)
1  2 
contrib/collection.cgi
src/collectd.conf.pod
src/perl.c
src/plugin.c
src/powerdns.c

Simple merge
Simple merge
diff --cc src/perl.c
Simple merge
diff --cc src/plugin.c
Simple merge
diff --cc src/powerdns.c
Simple merge