projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d8c379 18dc4a8)
Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Fri, 19 Jun 2015 18:08:24 +0000 (20:08 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 19 Jun 2015 18:08:24 +0000 (20:08 +0200)

Trivial merge
collectd, the system statistics collection daemon