projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68199d5 85d892d)
Merge branch 'collectd-5.8'
authorFlorian Forster <octo@collectd.org>
Thu, 7 Dec 2017 16:12:35 +0000 (17:12 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 7 Dec 2017 16:12:35 +0000 (17:12 +0100)
1  2 
src/email.c patch | diff1 | diff2 | blob | history

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