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

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

dfc0108321583d7a9b88357b079316397d3a107f