From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 1 Jun 2016 15:34:00 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~194
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fd81731a3e96d74a14c114d8808b44ee9673f9ef;p=jalview.git

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

merge
---

fd81731a3e96d74a14c114d8808b44ee9673f9ef