projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a41f312 25b5f5c)
Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 18 Mar 2016 12:04:19 +0000 (13:04 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 18 Mar 2016 12:04:19 +0000 (13:04 +0100)

Trivial merge
collectd, the system statistics collection daemon