From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 23 May 2016 12:22:40 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2110_makeSenseOfCrossRef
X-Git-Tag: Release_2_10_0~140^2~5^2~49^2~26
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=36b6d88e2fa30dd1a64101888d171a81bc5fbfaa;p=jalview.git

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

36b6d88e2fa30dd1a64101888d171a81bc5fbfaa