Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 07:59:54 +0000 (08:59 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 26 Apr 2016 07:59:54 +0000 (08:59 +0100)
commit49a16230c3aa7081afe8a6c502bac36b46b25eee
treee4722070c13d6ecad18af78e357fa834cdf92329
parent92f9cb121f5e6bb97fb1356404534ddd64431e21
parentd75831d25c0ceb20f43f37cace8f6704ded46861
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop