From: Florian Forster <octo@noris.net>
Date: Wed, 19 May 2010 08:47:58 +0000 (+0200)
Subject: Merge remote branch 'origin/collectd-4.9' into collectd-4.9
X-Git-Tag: collectd-4.9.3~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63f424212ca2bf3472af842a68881a7a58e86d44;p=collectd.git

Merge remote branch 'origin/collectd-4.9' into collectd-4.9
---

63f424212ca2bf3472af842a68881a7a58e86d44