Merge remote-tracking branch 'github/pr/1009'
authorFlorian Forster <octo@collectd.org>
Tue, 19 May 2015 15:40:36 +0000 (17:40 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 19 May 2015 15:40:36 +0000 (17:40 +0200)
commit0c88d3b2d330c152be0bc6af8faecef0211a705e
tree9a0263b2827c171254d25b6459fa54673353e40b
parent7bc2dfa9f152276c0f39b2fc96f0b4a401795fa5
parent7b0f362e1766ff7f04fd5466680d3606140b6ddc
Merge remote-tracking branch 'github/pr/1009'
AUTHORS
README
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod