From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 26 Apr 2016 10:41:35 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~249^2~1
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=659cdd6d20a562ff4a856f2325399f2dbb398126

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

659cdd6d20a562ff4a856f2325399f2dbb398126