From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 27 Oct 2016 14:24:27 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_1^2~22
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=83c546d91b47e08f790ad41f88d58e587905d0bc;p=jalview.git

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

83c546d91b47e08f790ad41f88d58e587905d0bc