From: Florian Forster <octo@collectd.org>
Date: Fri, 4 Dec 2015 10:57:59 +0000 (+0100)
Subject: Merge branch 'pr/846'
X-Git-Tag: collectd-5.6.0~529
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;ds=sidebyside;h=7c702e464f9faf954c320ec5b87c4755083d82bd;p=collectd.git

Merge branch 'pr/846'
---

7c702e464f9faf954c320ec5b87c4755083d82bd