Code

Merge branch 'collectd-4.10' into collectd-5.3
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 12 Dec 2014 22:13:15 +0000 (23:13 +0100)
commitc1318b06b424523d3704fcdfd16d3adb25d17d18
tree79225a0ae5d8d9b310ffc35bfcf0c881ba98b86b
parente86ddf6e071a6012d868202ba6aad12c056af533
parent7d6d1fa5855f053f262410e2d42968afa4514990
Merge branch 'collectd-4.10' into collectd-5.3

Conflicts:
src/libvirt.c
src/libvirt.c