From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 13 Jan 2010 14:52:12 +0000 (+0100)
Subject: Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
X-Git-Tag: collectd-4.8.3~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6732ba07293bd05b9c2b0202f9307e50565c0f6b;p=collectd.git

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

6732ba07293bd05b9c2b0202f9307e50565c0f6b