Code

Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:29 +0000 (18:53 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:53:29 +0000 (18:53 +0200)
1  2 
src/collectd.conf.pod
src/configfile.c
src/curl_json.c
src/plugin.c
src/utils_match.c
src/utils_match.h

Simple merge
Simple merge
diff --cc src/curl_json.c
Simple merge
diff --cc src/plugin.c
Simple merge
Simple merge
Simple merge