From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 5 Sep 2017 12:58:04 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103
X-Git-Tag: Release_2_10_3b1~140
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=95fbeeb7a08be4d24e1164c2f0ff3591893d10e2;p=jalview.git

Merge branch 'bug/JAL-2665-2.10.3' into portforward/JAL-2675_2102b1to2103

 Conflicts:
	src/jalview/gui/AlignmentPanel.java
	src/jalview/gui/SeqCanvas.java
---

95fbeeb7a08be4d24e1164c2f0ff3591893d10e2