From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 14 Mar 2009 17:52:19 +0000 (+0100)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.6.2~3^2~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e8999694aac7184ac4eea29564a2892f188c4171

Merge branch 'collectd-4.5' into collectd-4.6
---

e8999694aac7184ac4eea29564a2892f188c4171