From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 25 Oct 2016 10:54:52 +0000 (+0100)
Subject: Merge branch 'releases/Release_2_10_0_Branch_fixmaster' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_1~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7789821ca9dad74daf9bc189a882dc6c31ce12a4;p=jalview.git

Merge branch 'releases/Release_2_10_0_Branch_fixmaster' into releases/Release_2_10_Branch
---

7789821ca9dad74daf9bc189a882dc6c31ce12a4