projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08ed870 a5608f2)
Merge branch 'master' of github.com:collectd/collectd
authorPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:05:40 +0000 (09:05 +0200)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Sat, 26 Jul 2014 07:05:40 +0000 (09:05 +0200)

Trivial merge
collectd, the system statistics collection daemon