Code

Merge branch 'pr/1826'
authorFlorian Forster <octo@collectd.org>
Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 7 Aug 2016 08:32:28 +0000 (10:32 +0200)
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