From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 22 May 2009 15:45:22 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~111
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=509f73e3155ffc8998a2c600384f070f3ffc253e;p=collectd.git

Merge branch 'collectd-4.7'
---

509f73e3155ffc8998a2c600384f070f3ffc253e