From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 11 Apr 2009 07:37:30 +0000 (+0200)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~60
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=b423bd090e6a1af51446ad6967d5016045bd6ea5

Merge branch 'collectd-4.6'
---

b423bd090e6a1af51446ad6967d5016045bd6ea5