From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 22 Apr 2016 20:22:44 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1239'
X-Git-Tag: collectd-5.6.0~333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36ee20dc97d0e0a5483892667f5d032618e18f10;p=thirdparty%2Fcollectd.git

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

36ee20dc97d0e0a5483892667f5d032618e18f10