projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d64200 42ac121)
Merge remote-tracking branch 'github/pr/1355'
authorFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 21:46:30 +0000 (22:46 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 21:46:30 +0000 (22:46 +0100)

Trivial merge
collectd, the system statistics collection daemon