Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:03 +0000 (12:00 +0100)
committerFlorian Forster <octo@noris.net>
Fri, 28 Nov 2008 11:00:03 +0000 (12:00 +0100)
1  2 
contrib/collection.cgi
src/multimeter.c

Simple merge
Simple merge