From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 12 Dec 2009 22:36:07 +0000 (+0100)
Subject: Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9
X-Git-Tag: collectd-4.9.0~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=94c927f36710de531c2ab228d374ae9f24b7b873;p=collectd.git

Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9
---

94c927f36710de531c2ab228d374ae9f24b7b873