From: Florian Forster Date: Tue, 7 Oct 2008 07:29:04 +0000 (+0200) Subject: Merge branch 'master' of git://git.verplant.org/collectd X-Git-Tag: collectd-4.6.0~181 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1b321a7ab0181dc8cd9cca5ffbed74eb69f634d3;p=collectd.git Merge branch 'master' of git://git.verplant.org/collectd --- 1b321a7ab0181dc8cd9cca5ffbed74eb69f634d3