From: Florian Forster <octo@collectd.org>
Date: Wed, 12 Oct 2016 14:57:19 +0000 (+0200)
Subject: Merge branch 'pr/1609'
X-Git-Tag: collectd-5.7.0~50
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1e5687027549c68ecb29f33822501f6976debd5f;p=collectd.git

Merge branch 'pr/1609'
---

1e5687027549c68ecb29f33822501f6976debd5f