From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 12 May 2015 15:35:55 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~682
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7c5caa07d0f487073d859589149a91ea2b893105;hp=7c5caa07d0f487073d859589149a91ea2b893105;p=jalview.git

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