From: Florian Forster <octo@collectd.org>
Date: Mon, 8 Sep 2014 15:11:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: collectd-5.5.0~204
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=67411e0794cfcab38e322b2ebbe2e5207cbdd86a;p=collectd.git

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

67411e0794cfcab38e322b2ebbe2e5207cbdd86a