Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 4 Oct 2009 07:02:31 +0000 (09:02 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 4 Oct 2009 07:02:31 +0000 (09:02 +0200)
commit08597c4e80e8dd5d0a04c823b055ef230194a2b6
treecfc1d74a3d349e2ba640db5074d461e290c91e2b
parentec6204a39b67229bfb05b763d1ceea135150880d
parent44a080a9d7cecc63b7bf1842cdaf7ce357e08c46
Merge branch 'collectd-4.7' into collectd-4.8

Conflicts:
ChangeLog
version-gen.sh
ChangeLog