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

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

bfe7fff2c9139d0ad41c8375897f1af991912138