Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 26 Feb 2016 21:58:15 +0000 (22:58 +0100)
1  2 
configure.ac
src/apache.c
src/collectd.conf.in
src/modbus.c

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