From: Florian Forster <octo@noris.net>
Date: Thu, 21 Aug 2008 15:25:01 +0000 (+0200)
Subject: Merge branch 'master' of git://git.verplant.org/collectd
X-Git-Tag: collectd-4.5.0~52
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5c173359debb2664fad38f9b494d303bfc93496e;p=collectd.git

Merge branch 'master' of git://git.verplant.org/collectd
---

5c173359debb2664fad38f9b494d303bfc93496e