Merge remote-tracking branch 'github/pr/1065' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 16:35:13 +0000 (17:35 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 16:35:13 +0000 (17:35 +0100)
commit85444aff6af9e48eec21ccf32d19eb0296567d5b
tree3786121a909beec337f01b919dc50e3291a2de6f
parent38203b1c8d8a8e5e567d7f6783dd8b88a2487070
parent8c103cf17c65f4381db0d9f32cc4c3f4b4dc0875
Merge remote-tracking branch 'github/pr/1065' into collectd-5.5