projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e4b4e1 df7ef4f)
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
authorFlorian Forster <octo@noris.net>
Wed, 6 Oct 2010 08:11:10 +0000 (10:11 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 6 Oct 2010 08:11:10 +0000 (10:11 +0200)

Trivial merge
collectd, the system statistics collection daemon