Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:35 +0000 (08:47 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:47:35 +0000 (08:47 +0100)
commit4dc9287f4de0283ae986444377075dcbdada2871
tree79bf64252fb66a85fdca4949480d4d90f0bc767c
parentef3c8ce93f6cfb2517a2b2d6ea7c07a81e8c41f3
parentce0118ae5a67654cce06dddc9998dc494beb4251
Merge branch 'collectd-4.10' into collectd-5.0
src/exec.c
src/threshold.c