Merge branch 'collectd-4.4'

author Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>

Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)

committer Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>

Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
author Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
committer Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/email.c
Simple merge
diff --cc src/ntpd.c
Simple merge
diff --cc src/utils_threshold.c
Simple merge
author	Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
	Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
committer	Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
	Tue, 27 May 2008 11:16:55 +0000 (13:16 +0200)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/email.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ntpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils_threshold.c	patch \|	diff1 \|	diff2 \|	blob \| history