Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:35:27 +0000 (00:35 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:35:27 +0000 (00:35 +0200)
commit872126c9a7e0a8f8ae2b28217c12c27c35af5237
treee48c2f37bf1bf9ed1c0020938a2300f75b53b856
parent9bd400b6073c7ad4e3ba4b6f568fd7f608a4b02f
parent24c2f247f6dc5c17b26d715346a380efababb08f
Merge branch 'collectd-5.5'
src/collectd.conf.in
src/daemon/Makefile.am