Code

Merge remote-tracking branch 'github/pr/2001'
authorFlorian Forster <octo@collectd.org>
Thu, 27 Oct 2016 19:29:43 +0000 (21:29 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 27 Oct 2016 19:29:43 +0000 (21:29 +0200)
commit538f8ff488573b173eee3f36a37c89b0c2b75321
tree88d6704480dbefb00d4213646190bb798e76e25f
parente1fda36ff7e4b5f508b630b614b182e298d91fb7
parent2ede5e7fd0f7e75edd1fba531cd870bb16092e71
Merge remote-tracking branch 'github/pr/2001'