Merge branch 'ff/nagios'
authorFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 15:07:44 +0000 (16:07 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 15:07:44 +0000 (16:07 +0100)
1  2 
configure.ac
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod

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