From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 8 Nov 2016 10:22:05 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_1^2~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a82c8a3708f63eab20c610580ed70800ab9ecfe4;p=jalview.git

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

a82c8a3708f63eab20c610580ed70800ab9ecfe4