Merge pull request #2017 from thomasp11/master
authorLuka Perkov <[email protected]>
Tue, 24 Nov 2015 17:50:37 +0000 (18:50 +0100)
committerLuka Perkov <[email protected]>
Tue, 24 Nov 2015 17:50:37 +0000 (18:50 +0100)
cshark: update to latest git HEAD


Trivial merge