From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 15 Sep 2009 20:17:49 +0000 (+0200)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.1~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beb06e98c5aea9272c5972eee372b42c6abdd2b0;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.7' into collectd-4.8
---

beb06e98c5aea9272c5972eee372b42c6abdd2b0