Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:29:16 +0000 (23:29 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:29:16 +0000 (23:29 +0200)
commit71478cd6550a4e930a1e9b8a906a66579e4e387a
tree54d7733f6b8e166eaaac7261c5d9a3c7f10e138c
parente7ed65fd9143d8b58ffd4f46eaf94f269231641a
parenta09f2fdf0450eb76317e1b7575a12ffb926068f4
Merge branch 'collectd-5.5'
configure.ac
src/daemon/plugin.c
src/modbus.c
src/varnish.c