From: Florian Forster <octo@collectd.org>
Date: Tue, 29 Jul 2014 14:25:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/682'
X-Git-Tag: collectd-5.5.0~254
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8f4a48a804f9d95010cf5ad469e4729cebc3e0e9;p=collectd.git

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

8f4a48a804f9d95010cf5ad469e4729cebc3e0e9