From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 17 Jun 2015 14:58:48 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-1780_export-settings_flatfile
X-Git-Tag: Release_2_10_0~296^2~137^2~19
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=9d50ff04f4bc9b6c8a73d9e0058b604a042f36ee;hp=-c

Merge branch 'develop' into features/JAL-1780_export-settings_flatfile
---

9d50ff04f4bc9b6c8a73d9e0058b604a042f36ee