Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Jun 2016 11:31:34 +0000 (12:31 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Jun 2016 11:31:34 +0000 (12:31 +0100)
commit1b464022dd7d919df66738a517b3b46f8126ad98
tree1cb4b3cfd41758af83397ff26b6aa3875258268a
parentede02500a0240fd0e2c6780ff5ab8e1d254a9a26
parent7271c53b93e7834da8e86fc0a4d7b7fb57f5a9d7
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop