From: Florian Forster <octo@collectd.org>
Date: Fri, 9 Aug 2013 05:23:45 +0000 (+0200)
Subject: Merge branch 'pr/392'
X-Git-Tag: collectd-5.5.0~347
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=574fa997d35e2a187d87b17e755eb8d9995bcb1d;p=collectd.git

Merge branch 'pr/392'
---

574fa997d35e2a187d87b17e755eb8d9995bcb1d