From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 24 Jan 2009 10:04:31 +0000 (+0100)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~95
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=98062438c25226e2e4a28ab629de5dfa27a79913;p=collectd.git

Merge branch 'collectd-4.5'
---

98062438c25226e2e4a28ab629de5dfa27a79913