projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e4dde6 eff5214)
Merge remote-tracking branch 'github/pr/1370'
authorFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 19:23:40 +0000 (20:23 +0100)

Trivial merge
collectd, the system statistics collection daemon