From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 24 Oct 2016 14:46:32 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_1~17
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=eb237b8722f4e1ad05e99fe8adfdab932b2e9de6;p=jalview.git

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

eb237b8722f4e1ad05e99fe8adfdab932b2e9de6