From: kiramt <k.mourao@dundee.ac.uk>
Date: Wed, 22 Mar 2017 13:53:57 +0000 (+0000)
Subject: Merge remote-tracking branch
X-Git-Tag: Release_2_10_2~3^2~149
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=ef0a35a8dff8c0cc6ffa634c2b01cdca61f74b3d

Merge remote-tracking branch
'origin/bug/JAL-2436featureRendererThreading' into develop

Conflicts:
	src/jalview/appletgui/OverviewPanel.java
	src/jalview/gui/OverviewPanel.java
---

ef0a35a8dff8c0cc6ffa634c2b01cdca61f74b3d