projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fea2563 ad2ad9f)
Merge remote-tracking branch 'github/pr/2381'
authorFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 08:02:45 +0000 (10:02 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 08:02:45 +0000 (10:02 +0200)

Trivial merge
collectd, the system statistics collection daemon