From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 7 Dec 2009 10:59:32 +0000 (+0100)
Subject: Merge branch 'ff/routeros'
X-Git-Tag: collectd-4.9.0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ca5af2937040553d53be13b5d5e049c6495c6423;p=collectd.git

Merge branch 'ff/routeros'
---

ca5af2937040553d53be13b5d5e049c6495c6423