From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 29 May 2017 10:52:46 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2517cancelAppletColour' into develop
X-Git-Tag: Release_2_10_2~3^2~60
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4cdd50c885b85082d6acc9b0d2ca0db7213f61ab;p=jalview.git

Merge branch 'bug/JAL-2517cancelAppletColour' into develop
---

4cdd50c885b85082d6acc9b0d2ca0db7213f61ab