Merge branch 'develop' into features/JAL-1780_export-settings_flatfile
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 10:40:07 +0000 (11:40 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 10:40:07 +0000 (11:40 +0100)

Trivial merge