From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 1 Aug 2015 07:09:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1168'
X-Git-Tag: collectd-5.6.0~627
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1d3ed298b5454ea71a0995f4d99048279944bc62;p=collectd.git

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

1d3ed298b5454ea71a0995f4d99048279944bc62