From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 18 Apr 2018 13:22:41 +0000 (+0100)
Subject: Merge branch 'develop' into features/mchmmer
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=96b0d20fd5f2d43f3c787988a5c4974b7de1ed32;p=jalview.git

Merge branch 'develop' into features/mchmmer

Conflicts:
	.classpath
---

96b0d20fd5f2d43f3c787988a5c4974b7de1ed32