From: Florian Forster <octo@collectd.org>
Date: Wed, 17 Jun 2015 12:52:31 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~681
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a7499fb388e73b2d71f880be054c603fed324a0e;p=collectd.git

Merge branch 'collectd-5.5'
---

a7499fb388e73b2d71f880be054c603fed324a0e