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

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

933794f42ed55d57850424e3459a54cd2d92c933