projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dcc047 71d8519)
Merge remote-tracking branch 'github/pr/2422'
authorFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 15:10:46 +0000 (17:10 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 21 Sep 2017 15:10:59 +0000 (17:10 +0200)
Fixes: #2421


Trivial merge
collectd, the system statistics collection daemon