projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 005bf28 d504075)
Merge remote-tracking branch 'github/pr/1962'
authorFlorian Forster <octo@collectd.org>
Wed, 28 Sep 2016 13:24:52 +0000 (15:24 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Sep 2016 13:24:52 +0000 (15:24 +0200)

Trivial merge
collectd, the system statistics collection daemon