From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 5 Jan 2010 10:50:22 +0000 (+0100)
Subject: Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9
X-Git-Tag: collectd-4.9.1~6
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=3ae8778a363fc4383f1135ae99b389fad96978f3

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

3ae8778a363fc4383f1135ae99b389fad96978f3