From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 13 Dec 2006 07:05:27 +0000 (+0100)
Subject: Merge branches 'sh/email' and 'ls/processes'
X-Git-Tag: collectd-3.11.0~13
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=f807d67073930df2240b60c5d20c863f6e32e915

Merge branches 'sh/email' and 'ls/processes'
---

f807d67073930df2240b60c5d20c863f6e32e915