Merge remote-tracking branch 'github/pr/2026' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 06:03:17 +0000 (07:03 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 7 Nov 2016 06:03:17 +0000 (07:03 +0100)
commit68d6aff96c029c9a455b7a0146c788af08f9ff22
tree5950e5e69c4a080baa52bfad4ce039eb3ac6c8f2
parentf0481f16ff200ef93c6ea4487a7bc3a59c8f52cb
parent0a95eb509bebdd867a65105cdcbc0325d1cccddc
Merge remote-tracking branch 'github/pr/2026' into collectd-5.5