From: Garret Heaton <powdahound@gmail.com>
Date: Mon, 9 Nov 2009 16:53:51 +0000 (-0800)
Subject: Merge branch 'master' of git://github.com/octo/collectd
X-Git-Tag: collectd-4.10.0~2^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0f512f5546c5d45721171d6dc891488b47b601a3;p=collectd.git

Merge branch 'master' of git://github.com/octo/collectd
---

0f512f5546c5d45721171d6dc891488b47b601a3