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

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

a8e76ac6fa62f180499224bd6495aed47f24f9bd