From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 31 May 2017 10:46:22 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_2~3^2~49
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=16715d3095fc3dc3a39def681f00c3109ffc86e3;p=jalview.git

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

16715d3095fc3dc3a39def681f00c3109ffc86e3