From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 8 Sep 2014 15:32:54 +0000 (+0200)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~203
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e30c4b09f2ba06ed279d7ddfdc3714e1b3ab3a06;p=collectd.git

Merge branch 'collectd-5.4'
---

e30c4b09f2ba06ed279d7ddfdc3714e1b3ab3a06