projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cea744 10cb070)
Merge remote-tracking branch 'github/pr/1403'
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:40:41 +0000 (08:40 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 07:40:41 +0000 (08:40 +0100)

Trivial merge
collectd, the system statistics collection daemon