From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 10 Apr 2017 14:49:26 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2393customMatrices
X-Git-Tag: Release_2_10_2~3^2~105^2~2^2~28
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8a90391b6a6bd00adeb3289044fa34d88d74d978;p=jalview.git

Merge branch 'develop' into features/JAL-2393customMatrices
---

8a90391b6a6bd00adeb3289044fa34d88d74d978