From: kiramt <k.mourao@dundee.ac.uk>
Date: Thu, 23 Mar 2017 20:40:10 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_2~3^2~141^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e48d34b3938b4ac05a3dcaf3ab29e6317080f229;p=jalview.git

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

e48d34b3938b4ac05a3dcaf3ab29e6317080f229