projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f9418d e81567f)
Merge remote-tracking branch 'github/pr/2040'
authorFlorian Forster <octo@collectd.org>
Mon, 21 Nov 2016 07:33:42 +0000 (08:33 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 21 Nov 2016 07:33:42 +0000 (08:33 +0100)

Trivial merge
collectd, the system statistics collection daemon