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

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

567c2595554096f10feab130153f97286f3f7d80