Code

Merge branch 'collectd-4.10' into collectd-5.0
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 14 Mar 2011 19:08:24 +0000 (20:08 +0100)
commit50c6b81549e3239034f71f00ff7dde4c6a8767e5
tree08952ebd535ed183a9e82b6cabf92d9258fe7b28
parenta694ecb8cc8e1b369c87a427c145872f22fada41
parente04cfcb9d1f1eed00bf11768db6d0540babe2e4e
Merge branch 'collectd-4.10' into collectd-5.0
src/collectd.conf.pod
src/plugin.c
src/processes.c
src/python.c