From: Florian Forster <octo@collectd.org>
Date: Mon, 6 Feb 2012 13:37:52 +0000 (+0100)
Subject: Merge branch 'master' into ss/graphite
X-Git-Tag: collectd-5.1.0~33^2~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5e1d7902ffae810f851f4298683f675fc538f5bd;p=collectd.git

Merge branch 'master' into ss/graphite
---

5e1d7902ffae810f851f4298683f675fc538f5bd