projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5e428c d8a2713)
Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:43:27 +0000 (17:43 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 29 Apr 2008 15:43:27 +0000 (17:43 +0200)

Trivial merge
collectd, the system statistics collection daemon