From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 21 Aug 2017 13:36:20 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2609fastPaintWrapped
X-Git-Tag: Release_2_10_3b1~91^2~6^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2f96125e48e277a8296e9e2b53719f346f043ceb;p=jalview.git

Merge branch 'develop' into features/JAL-2609fastPaintWrapped

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

2f96125e48e277a8296e9e2b53719f346f043ceb