projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea44b73 2bdfc25)
Merge branch 'sh-pidfile'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Oct 2006 16:32:58 +0000 (18:32 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Oct 2006 16:32:58 +0000 (18:32 +0200)

Trivial merge
collectd, the system statistics collection daemon