From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 16 Sep 2015 14:04:42 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~400^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=13780a3ec7ad170f1571005692c5eb17466d8138;p=jalview.git

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

13780a3ec7ad170f1571005692c5eb17466d8138