Merge branch 'develop' into Release_2_9_Branch
authorJim Procter <jprocter@issues.jalview.org>
Thu, 10 Sep 2015 10:06:46 +0000 (11:06 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 10 Sep 2015 10:06:46 +0000 (11:06 +0100)

Trivial merge