projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4383a97 35518a6)
Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Tue, 7 Oct 2008 07:29:04 +0000 (09:29 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 7 Oct 2008 07:29:04 +0000 (09:29 +0200)

Trivial merge
collectd, the system statistics collection daemon