From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 29 Apr 2016 14:57:58 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~235^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d645ed1944459b6271dea2a8511a1e0f4f997530;p=jalview.git

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

d645ed1944459b6271dea2a8511a1e0f4f997530