From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 15 Jul 2009 09:11:12 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~74
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=5137825deeb5d4a5b763185f45b3916ccc49340d

Merge branch 'collectd-4.7'
---

5137825deeb5d4a5b763185f45b3916ccc49340d