projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1b0aa5 9c8f311)
Merge remote-tracking branch 'upstream/master'
authorClaudius Zingerli <githubkszmail@zeuz.ch>
Wed, 20 Jan 2016 16:15:04 +0000 (17:15 +0100)
committerClaudius Zingerli <githubkszmail@zeuz.ch>
Wed, 20 Jan 2016 16:15:04 +0000 (17:15 +0100)

Trivial merge
collectd, the system statistics collection daemon