Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Aug 2015 15:26:20 +0000 (16:26 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 17 Aug 2015 15:26:20 +0000 (16:26 +0100)
commit195951ef78cb23b658fa05149eb87573878ef388
treed48bbe7b4c65a8a4603e7b3f98f4737dbd35befd
parent07e95212532922e9a7966b81724b5a54e26b51a8
parentfee3871cb73a8a9d5695328352276b4b14419bed
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop