Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 14 Aug 2017 09:33:33 +0000 (10:33 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 14 Aug 2017 09:33:33 +0000 (10:33 +0100)

Trivial merge