Code

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)
1  2 
configure.ac
src/daemon/plugin.c
src/modbus.c
src/varnish.c

diff --cc configure.ac
Simple merge
Simple merge
diff --cc src/modbus.c
Simple merge
diff --cc src/varnish.c
Simple merge