From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 23 Nov 2016 17:44:50 +0000 (+0000)
Subject: Merge branch 'develop' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_1~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=faa1540e197dc509d2044d4b5af39e8dd903793f;p=jalview.git

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

faa1540e197dc509d2044d4b5af39e8dd903793f