projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6286127 2bda2a5)
Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 21:16:31 +0000 (22:16 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 21:16:31 +0000 (22:16 +0100)

Trivial merge
collectd, the system statistics collection daemon