From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 13 Apr 2008 09:06:14 +0000 (+0200)
Subject: Merge branch 'sh/teamspeak2'
X-Git-Tag: collectd-4.4.0~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63c8e3eaa6260e4bf52dfe7b1927ed69447c3b93;p=collectd.git

Merge branch 'sh/teamspeak2'
---

63c8e3eaa6260e4bf52dfe7b1927ed69447c3b93