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

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

62cdf4a06bef088c02f81c66ab2fe0bc3264e321