From: Florian Forster <octo@noris.net>
Date: Wed, 23 Jul 2008 15:17:49 +0000 (+0200)
Subject: Merge branch 'ff/owfs'
X-Git-Tag: collectd-4.5.0~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c71b8d22d731098030a81dd974f2f76ac7f7b32e;p=thirdparty%2Fcollectd.git

Merge branch 'ff/owfs'
---

c71b8d22d731098030a81dd974f2f76ac7f7b32e