From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 21 Dec 2006 20:12:24 +0000 (+0100)
Subject: Merge branch 'sh/email'
X-Git-Tag: collectd-3.11.0~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1b27073f0046bbbe7e84c0a3c79ca3bde8c800df;p=collectd.git

Merge branch 'sh/email'
---

1b27073f0046bbbe7e84c0a3c79ca3bde8c800df