projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63b17f5 57a8ff5)
Merge branch 'ls/shutdown'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 17:08:15 +0000 (18:08 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 5 Dec 2006 17:08:15 +0000 (18:08 +0100)

Trivial merge
collectd, the system statistics collection daemon