From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 16 Mar 2016 14:12:06 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~296^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=340055aeac7c0be1fe8cccf4aaa8646928c8e78c;p=jalview.git

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

340055aeac7c0be1fe8cccf4aaa8646928c8e78c