Code

Merge branch 'collectd-4.9'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 25 Feb 2010 23:17:18 +0000 (00:17 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 25 Feb 2010 23:17:18 +0000 (00:17 +0100)
commit67e4e517f58dac2a7b0e63b80256231480bfa59d
tree85f8b44d514e46c84f5dcd15942f0f414019284c
parentced2f3438fb1c333cd582a7d944d524b56ba0ef3
parent3bd6fcdfd20002eee1f1803460728449c0c98f86
Merge branch 'collectd-4.9'
configure.in
contrib/collection.cgi
src/apache.c
src/collectd-python.pod
src/collectd.conf.in
src/collectd.conf.pod