From: Pierre-Yves Ritschard Date: Fri, 17 Jan 2014 07:54:24 +0000 (+0100) Subject: Merge branch 'master' into feature-normalized-cpu X-Git-Tag: collectd-5.5.0~316^2~1 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=b50920ffc27a0f6b0020095af06e705f14894fad Merge branch 'master' into feature-normalized-cpu --- b50920ffc27a0f6b0020095af06e705f14894fad