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

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

724443f3af7a6aace6193a9a2e1498a0b7e97805