From: Florian Forster <octo@collectd.org>
Date: Thu, 9 Jul 2015 07:35:08 +0000 (+0200)
Subject: Merge branch 'pr/36' into mqtt
X-Git-Tag: collectd-5.6.0~637^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad8f6ed16e234ebe4f52d0e3d3c3f4695c6e1d16;p=collectd.git

Merge branch 'pr/36' into mqtt
---

ad8f6ed16e234ebe4f52d0e3d3c3f4695c6e1d16