From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 25 Aug 2008 18:47:39 +0000 (+0200)
Subject: Merge branch 'master' of /var/lib/git/collectd
X-Git-Tag: collectd-4.5.0~41
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=150924b271e21387ad1929e2373cc6e0772dc351;p=collectd.git

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

150924b271e21387ad1929e2373cc6e0772dc351