From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Thu, 23 Jan 2014 13:17:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/pr/490' into collectd-5.3
X-Git-Tag: collectd-5.4.1~1^2~1
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=d2e9e78adec531d4c90460c9a39ccf6ed388cd69

Merge remote-tracking branch 'origin/pr/490' into collectd-5.3
---

d2e9e78adec531d4c90460c9a39ccf6ed388cd69