Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 26 Feb 2016 21:53:19 +0000 (22:53 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 26 Feb 2016 21:53:19 +0000 (22:53 +0100)
commit3307054b6ab46b51fdda4f528e72d119e9de3071
tree6390c419b9f98b5b12fc5d102b06676ed136d921
parentf7f5868ee0378791ccd8d1788e27ebf2a02737dc
parent9c0d7874312b86db7ca94c12f1285ae6d1cb0c1a
Merge branch 'collectd-5.4' into collectd-5.5
configure.ac
src/apache.c
src/collectd.conf.in
src/modbus.c