From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 22 Mar 2016 08:42:26 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~290^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=31550615d6496099a12775c8a58f29e7cc926fad;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

31550615d6496099a12775c8a58f29e7cc926fad