Merge branches 'sh/email' and 'ls/processes'

[collectd.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index 30e95ce..cde1d11 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,10 @@
 This package was written by:
   Florian octo Forster <octo at verplant.org>
 
-cpufreq module by:
+apcups plugin by:
+  Anthony Gialluca <tonyabg at charter.net>
+
+cpufreq and multimeter module by:
   Peter Holik <peter at holik.at>
 
 hddtemp module by:
@@ -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>
 
@@ -35,7 +41,11 @@ contributed:
 The `log' mode has been written by:
   Christophe Kalt <collectd at klb.taranis.org>
 
+Much time and effort to find a nasty bug in the ntpd-plugin has been
+contributed by:
+  Lubos Stanek <lubek at users.sourceforge.net>
+
 collectd is available at:
-  <http://verplant.org/collectd/>
+  <http://collectd.org/>
 
 Enjoy :)