projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fc6255 bbe3fb2)
Merge remote-tracking branch 'github/pr/1883'
authorFlorian Forster <octo@collectd.org>
Mon, 15 Aug 2016 17:55:49 +0000 (19:55 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 15 Aug 2016 17:55:49 +0000 (19:55 +0200)
1  2 
README patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
collectd, the system statistics collection daemon