From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 29 Jun 2016 13:21:32 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2110_crossRefDuplications
X-Git-Tag: Release_2_10_0~140^2~5^2~34
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=930ea966c0d7742338e3ff4f9e65e4ceb3fc3a0f;p=jalview.git

Merge branch 'develop' into features/JAL-2110_crossRefDuplications
---

930ea966c0d7742338e3ff4f9e65e4ceb3fc3a0f