From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 13 May 2015 07:26:31 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~681
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=53886840dff4d962fe82725a5b9b594b970a8f4d;p=jalview.git

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

53886840dff4d962fe82725a5b9b594b970a8f4d