From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 1 Jul 2015 14:53:40 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~585^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6e79eb7f3978f7e4ab11b7e2aa334a6e9b739996;p=jalview.git

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

6e79eb7f3978f7e4ab11b7e2aa334a6e9b739996