Merge branch 'collectd-4.5'

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

Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)

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

Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/perl.c
Simple merge
diff --cc src/postgresql.c
Simple merge
diff --cc src/types.db
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/perl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/postgresql.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history