Merge branch 'develop' into features/JAL-2393customMatrices
authorJim Procter <jprocter@issues.jalview.org>
Tue, 2 May 2017 12:46:06 +0000 (13:46 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 2 May 2017 12:46:06 +0000 (13:46 +0100)

Trivial merge