Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Tue, 6 Sep 2016 06:42:41 +0000 (08:42 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 6 Sep 2016 06:42:41 +0000 (08:42 +0200)
commitb4a45047de41551b5b8879eba548dcf2a199fa9b
tree91c60db5205382684458afb10931a1e3efd44114
parent9e2c04a0c5b1b0f4bd2269c29c27fe1f3b1115de
parented985cb9d3d89aec3490b17e0fda3ee97908f935
Merge branch 'collectd-5.6'
src/collectd.conf.pod