Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)
commitfbcd49e749c383728f81174280f976ae0d2be2c7
tree247c38a571bc267898d401557541ac9c0e536e0a
parentac73c75aed7c134c6db377a5a306d51e20356fbb
parent3812f29af0b4ae25d1e0114ee0afc4a83880e913
Merge branch 'collectd-5.5'
README
configure.ac
src/daemon/configfile.c