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

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

fa1b96bdca9954d44de8ed08e106ace44dcf66c3