projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42a9adc 7a43e0b)
Merge branch 'collectd-5.6'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 22 Aug 2016 20:13:13 +0000 (22:13 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 22 Aug 2016 20:13:13 +0000 (22:13 +0200)

Trivial merge
collectd, the system statistics collection daemon