projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9461848 79593ed)
Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:45 +0000 (15:05 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 28 Jun 2015 13:05:45 +0000 (15:05 +0200)

Trivial merge
collectd, the system statistics collection daemon