projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3c79dd b1f183c)
Merge remote-tracking branch 'github/pr/2052'
authorFlorian Forster <octo@collectd.org>
Fri, 25 Nov 2016 19:59:53 +0000 (20:59 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 25 Nov 2016 19:59:53 +0000 (20:59 +0100)

Trivial merge
collectd, the system statistics collection daemon