Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 May 2015 09:35:03 +0000 (10:35 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 20 May 2015 09:35:03 +0000 (10:35 +0100)
commit7245a524318f1e426e0e0c68109a4291c4e77be5
tree3b6ef00a2ca2906061c75d9b71849c873a3f3cdf
parenta430dc43a2c2a7feb0896757404f3244719de2f0
parenta31a2a6912d40a3ebde6c07aeecb481119b4afc6
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop