From: Florian Forster Date: Wed, 23 Jan 2008 12:57:29 +0000 (+0100) Subject: Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1 X-Git-Tag: collectd-4.3.0beta0~10^2~1^2~1 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=278d000ffbd978fce52871a9f33f0cf5e1ce49b7;p=collectd.git Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1 --- 278d000ffbd978fce52871a9f33f0cf5e1ce49b7