Merge branch 'collectd-4.4'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:46:34 +0000 (09:46 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:46:34 +0000 (09:46 +0200)
commitefbeffe4cc730d6e14ba45dddfee9ab5229f07dc
tree7fb683ba15e004e4797e0fb6f7c2e88b8bf864c6
parent043a6f45dbab10267d0bb81ec5ad9a313669ec35
parent903ebad4e6fe24e6b04097f18048b63ebb3bcb29
Merge branch 'collectd-4.4'

Conflicts:

configure.in
configure.in