Code

Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sun, 3 Feb 2013 10:36:48 +0000 (11:36 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 3 Feb 2013 10:36:48 +0000 (11:36 +0100)
1  2 
src/cpu.c

diff --cc src/cpu.c
Simple merge