![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 21 Jan 2016 20:26:38 +0000 (21:26 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Thu, 21 Jan 2016 20:26:38 +0000 (21:26 +0100) | ||
| commit | 218c57128f2e54960133cff3e774b5ef9944068a | |
| tree | 5612748fba45e1fe1d796e8c371370f7a05484fd | tree | snapshot |
| parent | 778a6720a300cf549f5bcca9c22a3ef09d97f16f | commit | diff |
| parent | 01bb122fca4bd5c767b795f9cff364d01f0573c3 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/df.c | diff1 | | diff2 | | blob | history |
| src/virt.c | diff1 | | | | blob | history |