projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: facbb03 b5b0158)
Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Mon, 28 Nov 2016 21:23:04 +0000 (22:23 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 28 Nov 2016 21:23:04 +0000 (22:23 +0100)

Trivial merge
collectd, the system statistics collection daemon