From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 15 Jun 2015 11:19:54 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~609
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b3206ecee2cb2787e7481c7aefc73f06fc3798c1;p=jalview.git

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

b3206ecee2cb2787e7481c7aefc73f06fc3798c1