From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 30 Sep 2016 13:23:46 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-98consensusMemory
X-Git-Tag: Release_2_10_1^2~22^2~3^2~17
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9de3dd6be87712ea6fc716b35869b17b0b3a9e2f;p=jalview.git

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

9de3dd6be87712ea6fc716b35869b17b0b3a9e2f