Merge branch 'collectd-4.5' into collectd-4.6

author Florian Forster <octo@leeloo.lan.home.verplant.org>

Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)

committer Florian Forster <octo@leeloo.lan.home.verplant.org>

Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)
diff --cc src/email.c
Simple merge
diff --cc src/memory.c
Simple merge
diff --cc src/processes.c
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 2 May 2009 08:50:56 +0000 (10:50 +0200)
		1	2
src/email.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/memory.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/processes.c	patch \|	diff1 \|	diff2 \|	blob \| history