From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 9 Aug 2013 15:06:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/376'
X-Git-Tag: collectd-5.4.0~11
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ba0be16485d017e2060bc3a1fef2cb0587a5336d;p=collectd.git

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

ba0be16485d017e2060bc3a1fef2cb0587a5336d