Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:28:05 +0000 (21:28 -0400)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:28:05 +0000 (21:28 -0400)
commit61fba41289decabc1a18c855fcd462fece9ab983
treed1799763f31db8c359b969aa7da2bf6fb8451e1a
parenta709b786e18b745526873780c0eabfed10a31d2a
parent66bdee8d4c974e893826335977e1cc52410380eb
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/irq.c

Change-Id: Ie6c78234f07cc5b7bac7e6914813e9545ce1b1af
.gitignore
src/irq.c
src/plugin.c
src/processes.c
src/utils_rrdcreate.c