From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 18 Jul 2016 15:36:58 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~138^2^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1671a58c39dc5cd36e742fe7c2cff5aa7ac8fe7;p=jalview.git

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

d1671a58c39dc5cd36e742fe7c2cff5aa7ac8fe7