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

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

35b39c5d53fa12b9e9ab497d4a8a665ff3cfef5d