From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 13 Jan 2010 11:14:02 +0000 (+0100)
Subject: Merge commit 'origin/ff/routeros'
X-Git-Tag: collectd-4.10.0~73
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb10ba66ee1c7d79cca5fb5281b71a146dad3474;p=collectd.git

Merge commit 'origin/ff/routeros'
---

fb10ba66ee1c7d79cca5fb5281b71a146dad3474