Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 1 Sep 2008 06:04:10 +0000 (08:04 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 1 Sep 2008 06:04:10 +0000 (08:04 +0200)
commit6acb19befc321c501e4d8b79f403ebda0c021acc
tree14006493a185703493514ecc4f8b8a956bcd0cdf
parent3f2f61c7d74d9204405a4b0c21390451c98665a7
parent759febb0c6b26e5bc470123efb5d10668595af67
Merge branch 'collectd-4.3' into collectd-4.4

Conflicts:

ChangeLog
version-gen.sh
ChangeLog