Merge branch 'develop' into features/JAL-653_gffalignments
authorJim Procter <jprocter@issues.jalview.org>
Fri, 5 Jun 2015 15:28:56 +0000 (16:28 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 5 Jun 2015 15:28:56 +0000 (16:28 +0100)

Trivial merge