From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 28 Oct 2006 08:16:44 +0000 (+0200)
Subject: Merge branch 'master' into ff/dns
X-Git-Tag: collectd-3.11.0~42^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=db71b0fa19cc0217f1460499f891a36ecc8f1c8e;p=collectd.git

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

db71b0fa19cc0217f1460499f891a36ecc8f1c8e