Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@collectd.org>
Sat, 26 Mar 2011 15:53:22 +0000 (08:53 -0700)
committerFlorian Forster <octo@collectd.org>
Sat, 26 Mar 2011 15:53:22 +0000 (08:53 -0700)
commit9aedf9ea09cc1c0d7d8293894d03e0fcbaa7bada
treef9c9c588a67ca953fb418d65da7a3cab512b43b0
parente04cfcb9d1f1eed00bf11768db6d0540babe2e4e
parentcd7b67afdac0ddaf09957208148245d1e5f3245e
Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
ChangeLog
version-gen.sh
ChangeLog
src/plugin.c
src/plugin.h