projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b75b88c df6f5e3)
Merge branch 'origin'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:38:29 +0000 (22:38 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:38:29 +0000 (22:38 +0200)

Trivial merge
collectd, the system statistics collection daemon