From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 20 Oct 2016 11:21:08 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_1~20
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=999da17dfcc3433b96f3a7e34458749573321e3e;hp=-c;p=jalview.git

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

999da17dfcc3433b96f3a7e34458749573321e3e