From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 13 Apr 2008 09:57:50 +0000 (+0200)
Subject: Merge branch 'sh/teamspeak2'
X-Git-Tag: collectd-4.4.0~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89dc9dc153a496698c57f86e6e3d8e9622a529a4;p=thirdparty%2Fcollectd.git

Merge branch 'sh/teamspeak2'
---

89dc9dc153a496698c57f86e6e3d8e9622a529a4