projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc3ddbb 2653da4)
Merge remote-tracking branch 'github/pr/1901'
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 06:23:46 +0000 (08:23 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 06:23:46 +0000 (08:23 +0200)

Trivial merge
collectd, the system statistics collection daemon