From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 3 Sep 2015 10:37:28 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~505^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d8d49ee2a757173fa4417af5e42cc16023e0ae09;p=jalview.git

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

d8d49ee2a757173fa4417af5e42cc16023e0ae09