From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 22 Nov 2008 00:06:11 +0000 (+0100)
Subject: Merge branch 'ff/filter'
X-Git-Tag: collectd-4.6.0~156
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eab9dd12e4730f22f8b48d2abc16518272b6e53c;p=thirdparty%2Fcollectd.git

Merge branch 'ff/filter'
---

eab9dd12e4730f22f8b48d2abc16518272b6e53c