Merge branch 'collectd-3.11'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 31 Mar 2007 06:09:50 +0000 (08:09 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 31 Mar 2007 06:09:50 +0000 (08:09 +0200)
commit1e7a1563af4e3a82e2f2e017dcabe9616624175d
tree776d59887670295546c5e28a8198fe8c79b7e597
parent05f37b50e75f25b66bafca0ff6af1c496b6eb01d
parent005b6639a65a4c4c4dc08d75b10862901e75b9da
Merge branch 'collectd-3.11'

Conflicts:

ChangeLog
ChangeLog
configure.in