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

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

af187b8931d3bd074b5d1ab4e10f19c58f78575e