From: Florian Forster Date: Wed, 9 Jun 2010 08:38:55 +0000 (+0200) Subject: Merge remote branch 'tokkee/sh/collectd-4.9' into collectd-4.9 X-Git-Tag: collectd-4.9.3~12 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=93d32dedac1cea88e5a9bd335a6413e040ed3566 Merge remote branch 'tokkee/sh/collectd-4.9' into collectd-4.9 --- 93d32dedac1cea88e5a9bd335a6413e040ed3566