projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5917eb3 0a8741b)
Merge remote-tracking branch 'github/pr/2058'
authorFlorian Forster <octo@collectd.org>
Sun, 27 Nov 2016 06:24:55 +0000 (07:24 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 27 Nov 2016 06:24:55 +0000 (07:24 +0100)

Trivial merge
collectd, the system statistics collection daemon