Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 29 Nov 2016 07:43:23 +0000 (07:43 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 29 Nov 2016 07:43:23 +0000 (07:43 +0000)

Trivial merge