From: Florian Forster <octo@huhu.verplant.org>
Date: Sat, 14 Jun 2008 15:53:25 +0000 (+0200)
Subject: Merge branch 'master' of /var/lib/git/collectd
X-Git-Tag: collectd-4.5.0~115
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a4d48134385bf44e033bfbcc397fb03572617d4e;p=collectd.git

Merge branch 'master' of /var/lib/git/collectd

Conflicts:

	src/email.c
---

a4d48134385bf44e033bfbcc397fb03572617d4e