Merge branch 'develop' into bug/JAL-2210_ensembl_uniprot_primaryrefs_alternate
authorJim Procter <jprocter@issues.jalview.org>
Tue, 27 Sep 2016 15:07:01 +0000 (16:07 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 27 Sep 2016 15:07:01 +0000 (16:07 +0100)

Trivial merge