From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 21 Jan 2008 17:29:34 +0000 (+0100)
Subject: Merge branch 'ff/manpage'
X-Git-Tag: collectd-4.3.0beta0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7c42c7b1c428f5cc5f30af1122488497b3b31b96;p=collectd.git

Merge branch 'ff/manpage'
---

7c42c7b1c428f5cc5f30af1122488497b3b31b96