projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1bfa71 b968fcb)
Merge remote-tracking branch 'github/pr/631'
authorFlorian Forster <octo@collectd.org>
Wed, 21 Sep 2016 13:25:07 +0000 (15:25 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 21 Sep 2016 13:25:07 +0000 (15:25 +0200)

Trivial merge
collectd, the system statistics collection daemon