projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 746faef 8339b50)
Merge branch 'collectd-5.7'
authorFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 18 Sep 2017 14:15:23 +0000 (16:15 +0200)

Trivial merge
collectd, the system statistics collection daemon