From: Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Date: Tue, 27 May 2008 11:16:46 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.1~5^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62430c784cf53c7dccb6fec021f9bb4c0d790a0f;p=collectd.git

Merge branch 'collectd-4.3' into collectd-4.4
---

62430c784cf53c7dccb6fec021f9bb4c0d790a0f