projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91b4a8d 01a1f95)
Merge remote-tracking branch 'github/pr/1973'
authorFlorian Forster <octo@collectd.org>
Wed, 5 Oct 2016 06:52:56 +0000 (08:52 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 5 Oct 2016 06:52:56 +0000 (08:52 +0200)

Trivial merge
collectd, the system statistics collection daemon