[tokkee]

tokkee.org

Code

projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8579aab bc42a61)
Merge branch 'collectd-4.7' into collectd-4.8
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 9 Dec 2009 15:50:42 +0000 (16:50 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 9 Dec 2009 15:50:42 +0000 (16:50 +0100)

Trivial merge
statistics collection and monitoring daemon (clone)