From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 6 Oct 2016 12:55:50 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-98consensusMemory
X-Git-Tag: Release_2_10_1^2~22^2~3^2~13
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b7c6fbe6d47b510f7ac845eb5c29e971ffb41cfb;p=jalview.git

Merge branch 'develop' into bug/JAL-98consensusMemory
---

b7c6fbe6d47b510f7ac845eb5c29e971ffb41cfb