projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9683eb 4d37074)
Merge remote-tracking branch 'github/pr/1929'
authorFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 08:50:40 +0000 (10:50 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 13 Sep 2016 08:50:40 +0000 (10:50 +0200)

Trivial merge
collectd, the system statistics collection daemon