From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 20 May 2015 09:35:03 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~664
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7245a524318f1e426e0e0c68109a4291c4e77be5;hp=-c;p=jalview.git

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

7245a524318f1e426e0e0c68109a4291c4e77be5