From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 9 Jul 2015 15:22:32 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~578
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=412f54e65fabc059b0c96d5a124b37d23176d071;p=jalview.git

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

412f54e65fabc059b0c96d5a124b37d23176d071