From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Sat, 9 Jul 2016 06:12:09 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2110_crossRefDuplications
X-Git-Tag: Release_2_10_0~140^2~5^2~10
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Ffeatures%2FJAL-2110_crossRefDuplications;p=jalview.git

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

4eb1ed22600411fe5b6e9ac93084b45429ccfad6