From: Florian Forster <octo@noris.net>
Date: Fri, 28 Nov 2008 11:00:15 +0000 (+0100)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~139
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ab4f1d2683276954ac03d3e47ad34ad75c4bba26;hp=-c;p=collectd.git

Merge branch 'collectd-4.5'
---

ab4f1d2683276954ac03d3e47ad34ad75c4bba26