projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53f5cd2 12b23a0)
Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 22 Mar 2008 08:40:00 +0000 (09:40 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 22 Mar 2008 08:40:00 +0000 (09:40 +0100)

Trivial merge
collectd, the system statistics collection daemon