From: Florian Forster <octo@collectd.org>
Date: Fri, 27 Nov 2015 09:06:20 +0000 (+0100)
Subject: Merge branch 'pr/1345'
X-Git-Tag: collectd-5.6.0~575
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c5e4282f0f4e332499feac3b07ce0f29e3d2b1c;p=thirdparty%2Fcollectd.git

Merge branch 'pr/1345'
---

0c5e4282f0f4e332499feac3b07ce0f29e3d2b1c