Code

Merge branch 'collectd-5.5' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100)
1  2 
configure.ac
src/battery.c
src/powerdns.c
src/utils_format_graphite.c

diff --cc configure.ac
Simple merge
diff --cc src/battery.c
Simple merge
diff --cc src/powerdns.c
Simple merge
Simple merge