From: Florian Forster <octo@noris.net>
Date: Wed, 21 Apr 2010 17:05:15 +0000 (+0200)
Subject: Merge branch 'collectd-4.9'
X-Git-Tag: collectd-4.10.0~17
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=a158940fd85bbef59a65f593cd8130896f5c44d0

Merge branch 'collectd-4.9'
---

a158940fd85bbef59a65f593cd8130896f5c44d0