Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:39:33 +0000 (12:39 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:39:33 +0000 (12:39 +0100)
commitfe6da88c2eb1637ef6dce0a7d928c202ededc450
tree98a307588041be81899a670b6db3275f957288ab
parenta405225945b75555dfbf515226e7cad3322d0b66
parent2e632b0929fb957fd686231658bc2999fdfb4b20
Merge branch 'collectd-5.7'