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)
commit4979d8dcd6f097eb8fd4661086e28accd31ff905
tree38524f51b6da612d55d17e8b8587464d216cd06b
parentd2b9c4b3bc02ebe5fac8b1f29013c542c16a620a
parent55ef2778ade050e2924eeb027c98feea103f1585
Merge branch 'collectd-5.5' into collectd-5.6
configure.ac
src/battery.c
src/powerdns.c
src/utils_format_graphite.c