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)
commita940e2555464956ae7b61d8d0d742f2acc001c5f
treebef71379881c59bbfa1c146673565779f2ad257b
parenta1ae4b5afaf3207a7070b85f802b41b32c0b9a20
parenteafb8003851eaea28dfe90b094fbd6be28a38c92
Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:

src/Makefile.am
configure.in
src/Makefile.am