projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
[collectd.git]
/
AUTHORS
diff --git
a/AUTHORS
b/AUTHORS
index
84e313d
..
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>