From: Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Date: Tue, 22 Apr 2008 11:17:05 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.3.3~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bec5a6dda77c05eae27e5aeecdf601e573090cc5;p=collectd.git

Merge branch 'collectd-4.2' into collectd-4.3
---

bec5a6dda77c05eae27e5aeecdf601e573090cc5