From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 17 Aug 2009 08:53:07 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~44
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0b9800153cec24ed79c71beaac265e33ee3001ba;p=collectd.git

Merge branch 'collectd-4.7'
---

0b9800153cec24ed79c71beaac265e33ee3001ba