From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 3 Nov 2016 16:50:29 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_1^2~18
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6ce883bac598cf25fe34995c7044fd6bd8ea2573;p=jalview.git

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

6ce883bac598cf25fe34995c7044fd6bd8ea2573