From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 21 Jan 2008 17:30:48 +0000 (+0100)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.3.0beta0~34
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=06d0305ee967a12cb541dee87f79c31cac9d1b10;hp=b62e76ba5220c5279c29d970a65fa5a74dc1f145;p=collectd.git

Merge branch 'pull/master'
---