Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 13 May 2015 07:26:31 +0000 (08:26 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 13 May 2015 07:26:31 +0000 (08:26 +0100)
commit53886840dff4d962fe82725a5b9b594b970a8f4d
tree00b96341b204ebee1170e81d3be909204820cdb4
parent7c5caa07d0f487073d859589149a91ea2b893105
parent4609be9dc7b290edf0c2fbcad9e6b6fc7f919d18
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop