From: Florian Forster <octo@collectd.org>
Date: Tue, 16 Jun 2015 18:38:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1085'
X-Git-Tag: collectd-5.6.0~685
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6a59a5a3f0eb7a0e81beeb948d8a31b17462efe;p=thirdparty%2Fcollectd.git

Merge remote-tracking branch 'github/pr/1085'
---

c6a59a5a3f0eb7a0e81beeb948d8a31b17462efe