From: Florian Forster <octo@collectd.org>
Date: Mon, 20 Jan 2014 16:56:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: collectd-5.5.0~323
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b9a04b4e7e8481b7375d5c5d11ab5b813165f14;p=collectd.git

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

9b9a04b4e7e8481b7375d5c5d11ab5b813165f14