From: Florian Forster Date: Sat, 30 Oct 2010 12:04:12 +0000 (+0200) Subject: Merge branch 'master' into ff/subsecond X-Git-Tag: collectd-5.0.0-beta0~19^2~22 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=17fcc3c1cd67ceb0b8305cabb9e7c1e66aba561f Merge branch 'master' into ff/subsecond --- 17fcc3c1cd67ceb0b8305cabb9e7c1e66aba561f