Code

Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 10 May 2009 15:22:47 +0000 (17:22 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 10 May 2009 15:22:47 +0000 (17:22 +0200)
commit108068f268cad453e5d3b54e288917409db1e467
tree0912f7e843782b578758cdb4c5497d8bc06608c0
parent37905c5a2370c8e6edae5011978773eeaa589d09
parentccd445eab1a68d3b9e2b28a6e5bc95ed0c964d8f
Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:
ChangeLog
version-gen.sh
ChangeLog