Code

Merge remote-tracking branch 'github/pr/1814'
authorFlorian Forster <octo@collectd.org>
Thu, 28 Jul 2016 10:25:16 +0000 (12:25 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 28 Jul 2016 10:25:16 +0000 (12:25 +0200)
commit3bfaa620f1a7f6653abccad7cb580b4fa2952f2f
treeb5b83b39ece0c2404d25521c7519e9b7cecf2251
parent157dd7be6904c59ce62d2ff404bc234eb2e32cbb
parent6df91618c338179f78f0e8e3de5823ff8638d9e1
Merge remote-tracking branch 'github/pr/1814'