From: Florian Forster <octo@collectd.org>
Date: Thu, 14 Aug 2014 15:49:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/703'
X-Git-Tag: collectd-5.5.0~223
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d4547a2861caad836701e70f805f7be68a91272e;p=collectd.git

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

d4547a2861caad836701e70f805f7be68a91272e