From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 20 Jan 2010 09:32:01 +0000 (+0100)
Subject: Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
X-Git-Tag: collectd-4.8.4~35
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=3dc81b33ff9f8ac56f4150b18cd6cd520d01a905

Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
---

3dc81b33ff9f8ac56f4150b18cd6cd520d01a905