Code

Merge remote-tracking branch 'github/pr/1980'
authorFlorian Forster <octo@collectd.org>
Tue, 11 Oct 2016 06:36:15 +0000 (08:36 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 11 Oct 2016 06:36:15 +0000 (08:36 +0200)
commita5dc46700b069994d91b92fb46c8b2c2a1468c34
tree04ca01a8c46f0d3b596f15c34f2726bbef0e5061
parent3a4ac4e07fd870d0fc026fadd25f5fe5e2dda598
parent1805cefd7f0cb4fb24209e4d0eb5fdf5daa6c414
Merge remote-tracking branch 'github/pr/1980'