projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5aa9bb0 301e912)
Merge branch 'pr/2004'
authorFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 11:44:05 +0000 (13:44 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 11:44:05 +0000 (13:44 +0200)

Trivial merge
collectd, the system statistics collection daemon