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)
commit63c8e3eaa6260e4bf52dfe7b1927ed69447c3b93
tree75b1d0893a3f2d72aa674d6d0895f5f8e3e0abaf
parent3b2e978335a17629147a516cc03cf1a0c5814a73
parent00bce37841341337f7947b53652969cd84cfcca4
Merge branch 'sh/teamspeak2'
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod
src/types.db