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

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

968fc870427d31fc2c0ea37bcbc01fcc79ded716