Merge branch 'develop' into bug/JAL-1775
authorJim Procter <jprocter@issues.jalview.org>
Mon, 15 Jun 2015 12:37:44 +0000 (13:37 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 15 Jun 2015 12:37:44 +0000 (13:37 +0100)

Trivial merge