From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 5 Nov 2006 12:10:09 +0000 (+0100)
Subject: Merge branch 'master' into ff/dns
X-Git-Tag: collectd-3.11.0~42^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a25ac81f5bd545fc52301596eb22cd45782958c9;p=collectd.git

Merge branch 'master' into ff/dns
---

a25ac81f5bd545fc52301596eb22cd45782958c9