Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Thu, 18 Jun 2015 14:55:53 +0000 (16:55 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 18 Jun 2015 14:55:53 +0000 (16:55 +0200)
commit1b15b227585497f72ab0e42d96d79c0313323bd4
treea9411c707b27864140035d423400259dce8bca31
parentf995a5d563c2832553b7d172332028811a47db4a
parent0003c4d3c184f0f437499d6073cd023dc7b659c2
Merge branch 'collectd-5.5'
src/Makefile.am
src/daemon/configfile.c
src/modbus.c
src/snmp.c
src/tail.c