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

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

db60896e1fa3a55367b6af0f01dbdc22738e6802