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)
Conflicts:

AUTHORS

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

diff --cc AUTHORS
+++ b/AUTHORS
@@@ -60,10 -60,9 +60,13 @@@ Much time and effort to find a nasty bu
  contributed by:
    Luboš Staněk <lubek at users.sourceforge.net>
  
 +uuid module by:
 +  Dan Berrange <berrange@redhat.com>
 +  Richard W.M. Jones <rjones@redhat.com>
 +
+ Libvirt integration by:
+   Richard Jones <rjones@redhat.com>
  collectd is available at:
    <http://collectd.org/>
  
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge