Merge branch 'sh/teamspeak2'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:06:14 +0000 (11:06 +0200)
1  2 
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/types.db

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge
diff --cc src/types.db
Simple merge