projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 157dd7b 6df9161)
Merge remote-tracking branch 'github/pr/1814'
authorFlorian Forster <octo@collectd.org>
Thu, 28 Jul 2016 10:25:16 +0000 (12:25 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 28 Jul 2016 10:25:16 +0000 (12:25 +0200)

Trivial merge
collectd, the system statistics collection daemon