From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 8 Aug 2014 07:28:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/603'
X-Git-Tag: collectd-5.5.0~232
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=79d834024d69d3b33e0fc4717b6560385b54cdd1;p=collectd.git

Merge remote-tracking branch 'origin/pr/603'
---

79d834024d69d3b33e0fc4717b6560385b54cdd1