[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35602ac 2d0c4c7)
Merge remote branch 'origin/collectd-4.8' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 9 Mar 2010 15:55:20 +0000 (16:55 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 9 Mar 2010 15:55:20 +0000 (16:55 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)