From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 9 Apr 2008 09:01:12 +0000 (+0200)
Subject: Merge branch 'ff/ascent'
X-Git-Tag: collectd-4.4.0~43
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=3552315a7b95c8d3835464649afbf6bb1ae9da0b

Merge branch 'ff/ascent'
---

3552315a7b95c8d3835464649afbf6bb1ae9da0b