From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 14 Mar 2009 17:08:10 +0000 (+0100)
Subject: Merge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5
X-Git-Tag: collectd-4.6.2~2^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0d4bdcec565e9882384e3a1a9c8d7a6fb3e78b2;p=collectd.git

Merge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5
---

f0d4bdcec565e9882384e3a1a9c8d7a6fb3e78b2