projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a2940d 00bcab0)
Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 13 Oct 2007 15:16:32 +0000 (17:16 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 13 Oct 2007 15:16:32 +0000 (17:16 +0200)

Trivial merge
collectd, the system statistics collection daemon