projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5c2af0 e4fcf03)
Merge branch 'vb/df'
authorFlorian Forster <octo@collectd.org>
Sat, 1 Jun 2013 07:25:19 +0000 (09:25 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 1 Jun 2013 07:25:19 +0000 (09:25 +0200)

Trivial merge
collectd, the system statistics collection daemon