projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68cf1d4 41786d5)
Merge branch 'ff/ascent'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 9 Apr 2008 09:01:12 +0000 (11:01 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 9 Apr 2008 09:01:12 +0000 (11:01 +0200)

Trivial merge
collectd, the system statistics collection daemon