From: Florian Forster <octo@collectd.org>
Date: Wed, 17 Jun 2015 15:29:48 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~678
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38dc4293b77a5b26e9727fa5ab154fe8930a5a8c;p=collectd.git

Merge branch 'collectd-5.5'
---

38dc4293b77a5b26e9727fa5ab154fe8930a5a8c