From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 22 May 2009 16:02:27 +0000 (+0200)
Subject: Merge branch 'ff/olsrd'
X-Git-Tag: collectd-4.8.0~110
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=46f9443b996f793a377be9098d98c640f2c53bca;p=collectd.git

Merge branch 'ff/olsrd'
---

46f9443b996f793a377be9098d98c640f2c53bca