From: Florian Forster <octo@collectd.org>
Date: Tue, 16 Jun 2015 20:46:25 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~683
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=fbcd49e749c383728f81174280f976ae0d2be2c7;p=collectd.git

Merge branch 'collectd-5.5'
---

fbcd49e749c383728f81174280f976ae0d2be2c7