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

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

f647b9ceacdc464621491653cfb3382b42ca14a5