octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk

[collectd.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 30e95ce..7fbc743 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,9 @@
 This package was written by:
   Florian octo Forster <octo at verplant.org>
 
+apcups plugin by:
+  Anthony Gialluca <tonyabg at charter.net>
+
 cpufreq module by:
   Peter Holik <peter at holik.at>
 
@@ -22,6 +25,9 @@ tape module by:
 users module by:
   Sebastian Harl <sh at tokkee.org>
 
+vserver module by:
+  Sebastian Harl <sh at tokkee.org>
+
 PID-file patch by:
   Tommie Gannert <d00-tga at d.kth.se>
 
@@ -36,6 +42,6 @@ The `log' mode has been written by:
   Christophe Kalt <collectd at klb.taranis.org>
 
 collectd is available at:
-  <http://verplant.org/collectd/>
+  <http://collectd.org/>
 
 Enjoy :)