From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 2 May 2017 08:28:30 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2393customMatrices
X-Git-Tag: Release_2_10_2~3^2~105^2~2^2~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8893171320c5734ac79136a93e1f4589dbe595e3;p=jalview.git

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

8893171320c5734ac79136a93e1f4589dbe595e3