projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 9fe0735 e4fe9b4)
Merge remote-tracking branch 'github/pr/1056'
authorFlorian Forster <octo@collectd.org>
Mon, 1 Jun 2015 17:15:58 +0000 (19:15 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 1 Jun 2015 17:15:58 +0000 (19:15 +0200)

Trivial merge
collectd, the system statistics collection daemon