projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19a7c07 2ece265)
Merge remote-tracking branch 'github/pr/2006'
authorFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 05:25:26 +0000 (07:25 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 28 Oct 2016 05:25:26 +0000 (07:25 +0200)

Trivial merge
collectd, the system statistics collection daemon