Code

Merge branch 'collectd-4.8' into collectd-4.9 collectd-4.9.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 14 Jan 2010 14:19:39 +0000 (15:19 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 14 Jan 2010 14:19:39 +0000 (15:19 +0100)
commit7e504c50768c77d78003e1e27afe6f9f81a85b85
tree3cec2f60759244f2affa7c33266ae6bfba5e1f24
parent652bf01441baf806cc0e5aed34e0e58746dc73ea
parent4ed1a6084d08463f09ccecd50be1fb245d49231e
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
ChangeLog
ChangeLog
src/collectd.conf.pod