From: Florian Forster <octo@collectd.org>
Date: Wed, 21 Sep 2016 13:25:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/631'
X-Git-Tag: collectd-5.7.0~72
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c4bce475033d055cf5370b33fc6b8675fad5667b;p=collectd.git

Merge remote-tracking branch 'github/pr/631'
---

c4bce475033d055cf5370b33fc6b8675fad5667b