projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64581b0 b267792)
Merge remote-tracking branch 'github/pr/1130'
authorFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:20:54 +0000 (12:20 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:20:54 +0000 (12:20 +0200)

Trivial merge
collectd, the system statistics collection daemon