Code

Merge branch 'collectd-4.4'
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
1  2 
src/collectd.conf.in
src/email.c
src/ntpd.c
src/utils_threshold.c

Simple merge
diff --cc src/email.c
Simple merge
diff --cc src/ntpd.c
Simple merge
Simple merge