[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 706cc84 8f1c887)
Merge remote branch 'trenkel/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 18:58:59 +0000 (19:58 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 8 Dec 2009 18:58:59 +0000 (19:58 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)