Code

Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 22 Apr 2010 09:14:25 +0000 (11:14 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 22 Apr 2010 09:14:25 +0000 (11:14 +0200)
commit105c64c6f20807fa105b6aa350cc79c0d3a38488
tree7af73e06ee03d275d7b0e07603accd4695f1f4dc
parentd48a9456e42af4ab5881ab055c95ceab71819bc1
parent6bbd2007deb393cffa3502902c1bd81c49328d33
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
ChangeLog
ChangeLog
version-gen.sh