From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 3 Sep 2018 14:04:14 +0000 (+0100)
Subject: Merge branch 'trialMerge' into releases/Release_2_10_5_Branch
X-Git-Tag: Release_2_10_5~28
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8adf4aca94b4eddf964960b3706368245a8ad485;p=jalview.git

Merge branch 'trialMerge' into releases/Release_2_10_5_Branch
---

8adf4aca94b4eddf964960b3706368245a8ad485