From: Florian Forster <octo@collectd.org>
Date: Mon, 13 Jul 2015 10:09:55 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~640
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bf1613564dfcb0a517b77d658a844ea37b45803f;p=collectd.git

Merge branch 'collectd-5.5'
---

bf1613564dfcb0a517b77d658a844ea37b45803f