Merge branch 'collectd-4.5'
authorFlorian Forster <octo@noris.net>
Fri, 10 Oct 2008 07:02:33 +0000 (09:02 +0200)
committerFlorian Forster <octo@noris.net>
Fri, 10 Oct 2008 07:02:33 +0000 (09:02 +0200)
commit332cf199806de625661fa3a9bf9555f7a47ba9f9
tree5c9a395cb6de9cff1adfac3fe21158df8233fe91
parent86f6ca2b5631e3ba487e420a670a7203260c8371
parent2c2e9a297f59c110ddd4adef6293fe80f39f15b7
Merge branch 'collectd-4.5'

Conflicts:

configure.in
README
configure.in