From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Mon, 3 Aug 2015 21:26:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1164'
X-Git-Tag: collectd-5.6.0~625
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a5ee52cc21aa6717b0c96fadb701a08b22c30928;p=collectd.git

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

a5ee52cc21aa6717b0c96fadb701a08b22c30928