Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 May 2015 11:06:20 +0000 (12:06 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 May 2015 11:06:20 +0000 (12:06 +0100)
commit94c5940912426e4dcdf198f4e79a84c38d7c1560
treedf846c59134a1e92912c686afd237ce051370d95
parentbd318fe40b8d07db486f47d788dcdc2df8cb9e9c
parentb496efef50e3bb790d74bf55e92d836cf0076534
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop