![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100) | ||
| commit | c1318b06b424523d3704fcdfd16d3adb25d17d18 | |
| tree | 79225a0ae5d8d9b310ffc35bfcf0c881ba98b86b | tree | snapshot |
| parent | e86ddf6e071a6012d868202ba6aad12c056af533 | commit | diff |
| parent | 7d6d1fa5855f053f262410e2d42968afa4514990 | commit | diff |
Merge branch 'collectd-4.10' into collectd-5.3
Conflicts:
src/libvirt.c
Conflicts:
src/libvirt.c
| src/libvirt.c | diff1 | | diff2 | | blob | history |