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

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

06d15fe3e9c6d6cd72fb97643b29c4be344c0117