Merge branch 'JABAWS_Release_2_0' of https://source.jalview.org/git/jabaws into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 23 Oct 2012 16:46:26 +0000 (17:46 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 23 Oct 2012 16:46:26 +0000 (17:46 +0100)

Trivial merge