From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 18 Sep 2015 15:35:39 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~394^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=847076c1a2868b171e517753ea5c39326026bde1;p=jalview.git

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

847076c1a2868b171e517753ea5c39326026bde1