From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 4 Nov 2016 15:34:11 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_1^2~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=12b24413e1668c55c7c8661ee04bc7a7e84c8bc0;p=jalview.git

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

12b24413e1668c55c7c8661ee04bc7a7e84c8bc0