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)
commitc15dbfc3739f7c3bbd8171797eaef55749008bfa
tree9c7a40bbebd7855c0748621670bdb8839838e709
parent0fe0b565ea84fb2363411366905c7cfb492cd709
parentb76b0341b759e4e2dbb2abd46d60b8decdf2fd6d
Merge branch 'collectd-4.9' into collectd-4.10
src/collectd.conf.pod
src/configfile.c
src/curl_json.c
src/plugin.c
src/utils_match.c
src/utils_match.h