projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 4380983 affa67a)
Merge remote-tracking branch 'github/pr/2412'
authorFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 06:53:01 +0000 (08:53 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 06:53:01 +0000 (08:53 +0200)

Trivial merge
collectd, the system statistics collection daemon