projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 696a7c6 e1da538)
Merge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10
authorFlorian Forster <octo@collectd.org>
Sat, 20 Oct 2012 06:57:02 +0000 (08:57 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 20 Oct 2012 06:57:02 +0000 (08:57 +0200)

Trivial merge
collectd, the system statistics collection daemon