From: kiramt <k.mourao@dundee.ac.uk>
Date: Mon, 15 May 2017 14:50:28 +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~89
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9b4c6a235744a840d6bf31e4fd06e644cebfa65a;hp=-c;p=jalview.git

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

9b4c6a235744a840d6bf31e4fd06e644cebfa65a