From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 18 Mar 2009 10:54:48 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.7.0~110
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=11d4faafeeb9e327ee58cfa00acd6079debaca40;p=collectd.git

Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
---

11d4faafeeb9e327ee58cfa00acd6079debaca40