From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 31 Mar 2010 13:16:32 +0000 (+0200)
Subject: Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
X-Git-Tag: collectd-4.8.4~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c37551925a5dee2731413cd96e1d046528e694c5

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

c37551925a5dee2731413cd96e1d046528e694c5