From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 2 Oct 2009 07:50:20 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.1~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=ec6204a39b67229bfb05b763d1ceea135150880d

Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
	README
---

ec6204a39b67229bfb05b763d1ceea135150880d
diff --cc README
index 50716172,f9e49f02..c5c2b7fa
--- a/README
+++ b/README
@@@ -50,10 -47,9 +47,13 @@@ Feature
      - cpufreq
        CPU frequency (For laptops with speed step or a similar technology)
  
+     - curl
+       Parse statistics from websites using regular expressions.
+ 
 +    - curl_json
 +      Retrieves JSON data via cURL and parses it according to user
 +      configuration.
 +
      - dbi
        Executes SQL statements on various databases and interprets the returned
        data.