From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 25 Apr 2017 11:45:44 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_2~3^2~127
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=79e8cf3898879d6cd7a53249b5bbb017752a095b;p=jalview.git

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

79e8cf3898879d6cd7a53249b5bbb017752a095b