Merge branch 'sh/teamspeak2'

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

Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)

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

Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/types.db
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history