From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 15 May 2017 10:59:29 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2446NCList
X-Git-Tag: Release_2_10_3b1~278
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=90029b4b40d8fcc9abed4567b11031e52cd74a2b;p=jalview.git

Merge branch 'develop' into features/JAL-2446NCList

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

90029b4b40d8fcc9abed4567b11031e52cd74a2b