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

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

8dfdafee89d06dd397c392619b4b285f0dc35430