From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 1 May 2017 17:16:56 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_2~3^2~115
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e75847be3733978d2cd51d7121778e782ad0abf3;p=jalview.git

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

e75847be3733978d2cd51d7121778e782ad0abf3