Merge branch 'master' of git://git.verplant.org/collectd

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..9bb4399
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Anthony <anthony>
+Florian Forster <octo>
+Florian Forster <octo@dev4.office.noris.de>
+Luboš Staněk <kolektor@atlas.cz>
+Luboš Staněk <lubek@users.sourceforge.net>
+Niki W. Waibel <niki>
+Sebastian Harl <tokkee>
+

diff --git a/README b/README
index a63c71b..8c8160c 100644 (file)
--- a/README
+++ b/README
@@ -367,6 +367,7 @@ Prerequisites
 
   * libcurl (optional)
     If you want to use the `apache', `ascent', or `nginx' plugin.
+    <http://curl.haxx.se/>
 
   * libdbi (optional)
     Used by the `dbi' plugin to connect to various databases.