Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 20 May 2009 09:02:06 +0000 (11:02 +0200)
commit5a7145dd5626503f411a4aed87f30fc0f9689c90
tree399ac82db9a7ec9fbb137840832dfc806ca37ba8
parentde23afd8e6b61c4e665e55b2700381582ae4c708
parentf331f9975e8d90a8c430ee7c739c4c3ed8bbb1ec
Merge branch 'collectd-4.6' into collectd-4.7
configure.in
src/plugin.c
src/rrdtool.c