projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33d409e 09dd112)
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 6 Dec 2006 08:59:20 +0000 (09:59 +0100)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 6 Dec 2006 08:59:20 +0000 (09:59 +0100)
1  2 
src/email.c patch | diff1 | diff2 | blob | history

diff --cc src/email.c
Simple merge
collectd, the system statistics collection daemon