Merge branch 'rj/libvirtstats'
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 6 Nov 2007 17:23:45 +0000 (18:23 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 6 Nov 2007 17:23:45 +0000 (18:23 +0100)
commitfd64cb0b732f4d248e6187c78eef184fbb2143b0
tree319b190541b1d2519d88ee9a85faef071cac941a
parent30f3e7b81e938d2fcf0512acb46e639a8cb37ae7
parent7f45f5b38fb6603172cd9d35d719927cef5e8370
Merge branch 'rj/libvirtstats'

Conflicts:

AUTHORS
AUTHORS
configure.in
src/Makefile.am
src/collectd.conf.pod