projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75323bd e452e3f)
Merge remote-tracking branch 'github/pr/1440'
authorFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 09:00:30 +0000 (10:00 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 8 Dec 2015 09:00:30 +0000 (10:00 +0100)

Trivial merge
collectd, the system statistics collection daemon