From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 6 Nov 2007 17:23:45 +0000 (+0100)
Subject: Merge branch 'rj/libvirtstats'
X-Git-Tag: collectd-4.3.0beta0~116
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=fd64cb0b732f4d248e6187c78eef184fbb2143b0;p=collectd.git

Merge branch 'rj/libvirtstats'

Conflicts:

	AUTHORS
---

fd64cb0b732f4d248e6187c78eef184fbb2143b0
diff --cc AUTHORS
index d821df7a,cd0ba6fe..6c2b33ff
--- a/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/>