projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e913f3f 2403dd0)
Merge branch 'sh/email'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 21 Dec 2006 20:12:24 +0000 (21:12 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 21 Dec 2006 20:12:24 +0000 (21:12 +0100)

Trivial merge
collectd, the system statistics collection daemon