From: Florian Forster <octo@collectd.org>
Date: Thu, 11 Jun 2015 06:50:27 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~692
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;ds=sidebyside;h=746a2c1d4d472f4eb86f88fe5b8a19f581eac451;p=collectd.git

Merge branch 'collectd-5.5'
---

746a2c1d4d472f4eb86f88fe5b8a19f581eac451