projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b27073 7751db6)
Merge branch 'ls/sensors'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 Dec 2006 09:38:07 +0000 (10:38 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 Dec 2006 09:38:07 +0000 (10:38 +0100)

Trivial merge
collectd, the system statistics collection daemon