Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 6 May 2009 14:37:18 +0000 (16:37 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 6 May 2009 14:37:18 +0000 (16:37 +0200)
Conflicts:

src/Makefile.am


No differences found