From: Florian Forster <octo@noris.net>
Date: Tue, 7 Oct 2008 07:29:04 +0000 (+0200)
Subject: Merge branch 'master' of git://git.verplant.org/collectd
X-Git-Tag: collectd-4.6.0~181
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1b321a7ab0181dc8cd9cca5ffbed74eb69f634d3;hp=4383a97f4f66c1abb514d2cc7eaa9104518da88e

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..9bb4399e
--- /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 a63c71bd..8c8160ce 100644
--- 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.