From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 9 May 2009 10:59:50 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.7.0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=be5f7543b4e5b6857913c5c646e28ea86e919467;p=collectd.git

Merge branch 'collectd-4.7'
---

0f74e253aeb26c3b4908fdced0a00c7c1f2ad5cd