From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 30 Sep 2016 13:17:53 +0000 (+0100)
Subject: Merge branch 'develop' into releases/Release_2_10_Branch
X-Git-Tag: Release_2_10_0~21^2~11
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=93eba900d0978c1ab368c3ab6b7f1a5df467e3a1;p=jalview.git

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

93eba900d0978c1ab368c3ab6b7f1a5df467e3a1