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

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

e529f0aa0690ac7a6f58677fd043135d21e5e148