projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e1b5b5 20b5c36)
Merge branch 'v392-fix' into v393-fix
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:52:53 +0000 (10:52 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:52:53 +0000 (10:52 +0200)

Trivial merge
collectd, the system statistics collection daemon