projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 517b79d 03c308c)
Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 19:03:23 +0000 (21:03 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 14 Aug 2016 19:03:23 +0000 (21:03 +0200)

Trivial merge
collectd, the system statistics collection daemon