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

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

cb77fa03b62c14642b0309839d6a067fec77bd57