projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 561844f 039c2b7)
Merge branch 'v393-fix' into b39-fix
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:56:59 +0000 (10:56 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 08:56:59 +0000 (10:56 +0200)

Trivial merge
collectd, the system statistics collection daemon