Merge branch 'ff/collection' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 10:41:21 +0000 (12:41 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 10:41:21 +0000 (12:41 +0200)
1  2 
contrib/collection.cgi

Simple merge