From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 27 Jul 2016 12:02:46 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~130
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9e266d98e1516ddfc10ad02197fc60b38a05f2d9;p=jalview.git

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

9e266d98e1516ddfc10ad02197fc60b38a05f2d9