From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 4 Oct 2017 15:02:59 +0000 (+0100)
Subject: Merge branch 'features/JAL-1793VCF' into spikes/mungo
X-Git-Tag: Release_2_11_0~62^2~26
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f708b46b35fe64dce97f5c8420104ba71cc21ff2;p=jalview.git

Merge branch 'features/JAL-1793VCF' into spikes/mungo

Conflicts:
	src/jalview/analysis/AlignmentUtils.java
	src/jalview/gui/PopupMenu.java
	src/jalview/io/vcf/VCFLoader.java
---

f708b46b35fe64dce97f5c8420104ba71cc21ff2