Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 4 Jun 2015 10:51:47 +0000 (11:51 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 4 Jun 2015 10:51:47 +0000 (11:51 +0100)
commitfd9ed8df6a98c86228100aa4e9d6698c87a61c08
treec9cf4bbb11ce8fab58c787d79aceee40608e56a5
parent85937698cb3a6d1fb8be1cfa7a1677e632da7be9
parent07554180e722a3949ad3b777d5ddeab3faa0b700
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop