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

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

merge
---