![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 6 Nov 2007 17:23:45 +0000 (18:23 +0100) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Tue, 6 Nov 2007 17:23:45 +0000 (18:23 +0100) | ||
| commit | fd64cb0b732f4d248e6187c78eef184fbb2143b0 | |
| tree | 319b190541b1d2519d88ee9a85faef071cac941a | tree | snapshot |
| parent | 30f3e7b81e938d2fcf0512acb46e639a8cb37ae7 | commit | diff |
| parent | 7f45f5b38fb6603172cd9d35d719927cef5e8370 | commit | diff |
Merge branch 'rj/libvirtstats'
Conflicts:
AUTHORS
Conflicts:
AUTHORS
| AUTHORS | diff1 | | diff2 | | blob | history |
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |