From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 2 Jun 2016 10:30:36 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~190
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7a37a68e3b219cd04563535b1cc64dd55b5f9438;p=jalview.git

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

merge
---

7a37a68e3b219cd04563535b1cc64dd55b5f9438