From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 16 Jun 2015 07:18:25 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~686
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=f64a8b0906df8f97fbe91f15a919c76b83f93ba9

Merge branch 'collectd-5.5'
---

f64a8b0906df8f97fbe91f15a919c76b83f93ba9