From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 18 Jan 2009 22:14:31 +0000 (+0100)
Subject: Merge branch 'master' into bp/bind
X-Git-Tag: collectd-4.6.0~98^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7e905b5dbb59d0ba43503896daf2a8dbf102eaba;p=collectd.git

Merge branch 'master' into bp/bind
---

7e905b5dbb59d0ba43503896daf2a8dbf102eaba