projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97e4d4b abc2bc2)
Merge branch 'collectd-4.0'
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 7 Jun 2007 07:25:08 +0000 (09:25 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 7 Jun 2007 07:25:08 +0000 (09:25 +0200)

Trivial merge
collectd, the system statistics collection daemon