Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:43 +0000 (10:57 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:43 +0000 (10:57 +0100)
commitbdd27cb013de89b4149393212aef1bf45a221dba
tree577c5aa675891df86a579f88cb7d691cf913a2dd
parentfadd45ecb0eabd5629c3ef5f93d05a1dac25ce73
parent1afa5e081f364890b7c855b728f26d3923f1cbb7
Merge branch 'collectd-5.6' into collectd-5.7