Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Sep 2015 09:21:01 +0000 (10:21 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 3 Sep 2015 09:21:01 +0000 (10:21 +0100)
commit46371d4ca5cf65bf625cb98a09817a84ebf869c0
tree035b8ad8e6b5160cf1efdc7aa39f480291010533
parentc6c94d2adb0d156345065b1a7e18e26c7b8dd2b8
parent3e0acd768b9b0a35aff4d5a4e862473c70e50100
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop