From: Florian Forster <octo@huhu.verplant.org>
Date: Sat, 2 Jun 2007 07:25:42 +0000 (+0200)
Subject: Merge branch 'pull/master'
X-Git-Tag: collectd-4.0.0~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6c9f69a4507e2ec9490e2baf76146f4036aa2b8e;p=collectd.git

Merge branch 'pull/master'
---

6c9f69a4507e2ec9490e2baf76146f4036aa2b8e