Merge pull request #2018 from thomasp11/for-15.05
authorLuka Perkov <luka.perkov@sartura.hr>
Tue, 24 Nov 2015 17:50:58 +0000 (18:50 +0100)
committerLuka Perkov <luka.perkov@sartura.hr>
Tue, 24 Nov 2015 17:50:58 +0000 (18:50 +0100)
cshark: update to latest git HEAD


Trivial merge