From: Jim Procter Date: Wed, 17 Jun 2015 10:40:07 +0000 (+0100) Subject: Merge branch 'develop' into features/JAL-1780_export-settings_flatfile X-Git-Tag: Release_2_10_0~296^2~137^2~20 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2de26e5c27ab904c1921329e7c498560bc0a1e4e;p=jalview.git Merge branch 'develop' into features/JAL-1780_export-settings_flatfile --- 2de26e5c27ab904c1921329e7c498560bc0a1e4e