Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 1 Nov 2016 16:11:05 +0000 (16:11 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 1 Nov 2016 16:11:05 +0000 (16:11 +0000)
commit181397340ae433d9c4e1cb2b6c543837a0cf48ad
tree8373131451de01ed52e4b909ef99e920cef79af8
parent429df8b06d6a9532ec12d683af22f8246502ca82
parentc96c7cbd9b1cf8b2f0c0715180e698f6c3f657d1
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop