projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95b08a8 61fba41)
Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:34:00 +0000 (21:34 -0400)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2011 01:34:00 +0000 (21:34 -0400)

Trivial merge
collectd, the system statistics collection daemon