From: Florian Forster <octo@noris.net>
Date: Tue, 29 Apr 2008 15:43:27 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' into collectd-4.3
X-Git-Tag: collectd-4.4.0~4^2~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c74b709edf61a3b7dfc24032f609956f0feb56e7;p=collectd.git

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

c74b709edf61a3b7dfc24032f609956f0feb56e7