From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 4 Jun 2015 10:51:47 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~640
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fd9ed8df6a98c86228100aa4e9d6698c87a61c08;p=jalview.git

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

fd9ed8df6a98c86228100aa4e9d6698c87a61c08