From: Claudius Zingerli <githubkszmail@zeuz.ch>
Date: Wed, 20 Jan 2016 16:15:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: collectd-5.6.0~258^2~17^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e6fa7293d20e9f987dd36a7de76436c6c79c240b;p=collectd.git

Merge remote-tracking branch 'upstream/master'
---

e6fa7293d20e9f987dd36a7de76436c6c79c240b