From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 11 Sep 2015 20:30:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/pr/1205'
X-Git-Tag: collectd-5.6.0~598
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44dda7ba64dfdcab9d5fa8dbffc3bea980f13ab9;p=thirdparty%2Fcollectd.git

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

44dda7ba64dfdcab9d5fa8dbffc3bea980f13ab9