From: kiramt <k.mourao@dundee.ac.uk>
Date: Wed, 10 May 2017 13:29:07 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_2~3^2~95
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2ef218faa692153c09a328d40b8f4724d69355f2;p=jalview.git

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

2ef218faa692153c09a328d40b8f4724d69355f2