projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1fda36 2ede5e7)
Merge remote-tracking branch 'github/pr/2001'
authorFlorian Forster <octo@collectd.org>
Thu, 27 Oct 2016 19:29:43 +0000 (21:29 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 27 Oct 2016 19:29:43 +0000 (21:29 +0200)

Trivial merge
collectd, the system statistics collection daemon