projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61767b2 7275a8f)
Merge remote-tracking branch 'github/pr/1558'
authorFlorian Forster <octo@collectd.org>
Wed, 4 Oct 2017 18:25:20 +0000 (20:25 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 4 Oct 2017 18:25:20 +0000 (20:25 +0200)

Trivial merge
collectd, the system statistics collection daemon