From: Florian Forster <octo@collectd.org>
Date: Fri, 16 Aug 2013 09:26:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/404'
X-Git-Tag: collectd-5.4.0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ebfc24ca56e086eb6761602f8323758455294c15;p=collectd.git

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

ebfc24ca56e086eb6761602f8323758455294c15