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)
commit39ba035b60b509311874ccf89d11d240c0271a90
tree5944c5c8b03061f8a6eac458da501ea9e13904ac
parent843d92b034b7303d818e222506bc165fb4f1fd22
parent148fe4faebc8bde13dc9e4429e687f752a6d3cde
Merge branch 'collectd-4.4' into collectd-4.5
contrib/collection.cgi
src/collectd.conf.pod
src/perl.c
src/plugin.c
src/powerdns.c