Merge branch 'develop' of https://source.jalview.org/git/jalview into JAL-976_jabaws2supp
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 9 Nov 2011 17:09:39 +0000 (17:09 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 9 Nov 2011 17:09:39 +0000 (17:09 +0000)

Trivial merge