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

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

b2c06af3e4e5bff86a1d2fca0f2ada78bef8ab52