projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3489284 d6491cf)
Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 15:29:48 +0000 (17:29 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 17 Jun 2015 15:29:48 +0000 (17:29 +0200)

Trivial merge
collectd, the system statistics collection daemon