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)
1  2 
AUTHORS
README
configure.ac
contrib/redhat/collectd.spec
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod

diff --cc AUTHORS
Simple merge
diff --cc README
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge