From: Florian Forster <octo@huhu.verplant.org>
Date: Thu, 12 Jun 2008 08:24:10 +0000 (+0200)
Subject: Merge branch 'master' of /var/lib/git/collectd
X-Git-Tag: collectd-4.5.0~117
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce07c14003240fcd63a8aa70c7261d14792fb76e;p=collectd.git

Merge branch 'master' of /var/lib/git/collectd
---

ce07c14003240fcd63a8aa70c7261d14792fb76e