Code

Merge remote-tracking branch 'github/pr/1883'
authorFlorian Forster <octo@collectd.org>
Mon, 15 Aug 2016 17:55:49 +0000 (19:55 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 15 Aug 2016 17:55:49 +0000 (19:55 +0200)
1  2 
README

diff --cc README
Simple merge