From: Florian Forster <octo@collectd.org>
Date: Fri, 19 Jun 2015 14:28:01 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~675
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6d8c3791a98eda82702ece14dbda46bc5f3de928;p=collectd.git

Merge branch 'collectd-5.5'
---

6d8c3791a98eda82702ece14dbda46bc5f3de928