From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 16 Oct 2008 20:50:15 +0000 (+0200)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~174
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2f712e8af3ae9461df24fe92098b44a0ee07d291;hp=-c;p=collectd.git

Merge branch 'collectd-4.5'
---

2f712e8af3ae9461df24fe92098b44a0ee07d291