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)
commitd38c16d60f9d1b10cb60f010ce086135e6ecbe07
tree28e83c1eea650cf2658e195387baafa0b0c783e8
parent1eb9440b75f8c5cc4c33cbc145d44a557cbb4f2e
parent3307054b6ab46b51fdda4f528e72d119e9de3071
Merge branch 'collectd-5.5'
configure.ac
src/apache.c
src/collectd.conf.in
src/modbus.c