[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d34937f 0cdda92)
Merge branch 'master' into ls/sensors
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:16:07 +0000 (13:16 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:16:07 +0000 (13:16 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)