Merge branch 'develop' into release/2_9_documentation
authorJim Procter <jprocter@issues.jalview.org>
Thu, 10 Sep 2015 02:42:05 +0000 (03:42 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 10 Sep 2015 02:42:05 +0000 (03:42 +0100)

Trivial merge