From: Florian Forster <octo@collectd.org>
Date: Wed, 2 Dec 2015 09:44:43 +0000 (+0100)
Subject: Merge branch 'pr/1394'
X-Git-Tag: collectd-5.6.0~535
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8a0163fec85502d1641757f2e3f536d498c7f2b8;p=collectd.git

Merge branch 'pr/1394'
---

8a0163fec85502d1641757f2e3f536d498c7f2b8