From: Sean Campbell <seancampbell04@gmail.com>
Date: Wed, 6 Dec 2017 00:05:08 +0000 (-0500)
Subject: Merge branch 'master' into pri
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=4c4988b1c5d33ed70b2d6d6e5a4eae13cab9255b

Merge branch 'master' into pri
---

4c4988b1c5d33ed70b2d6d6e5a4eae13cab9255b