From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 6 Nov 2015 09:03:32 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~343
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f3e176bc521595b2e00f8cc7dc250398fb54d655;p=jalview.git

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

f3e176bc521595b2e00f8cc7dc250398fb54d655