Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 14 Mar 2011 19:06:53 +0000 (20:06 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 14 Mar 2011 19:06:53 +0000 (20:06 +0100)
commite04cfcb9d1f1eed00bf11768db6d0540babe2e4e
treeed1d703217fd5e8eff7715f8900150348320c1c6
parentce0118ae5a67654cce06dddc9998dc494beb4251
parent27cd1bfc12b4c3c81ccd2d3f2cc1f6ef5028a94f
Merge branch 'collectd-4.9' into collectd-4.10
src/collectd.conf.pod
src/plugin.c
src/processes.c
src/python.c