projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 717eec3 53c0ed5)
Merge branch 'sh/shutdown'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 17:00:57 +0000 (18:00 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 17:00:57 +0000 (18:00 +0100)
1  2 
src/email.c patch | diff1 | diff2 | blob | history

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