From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 14 Apr 2016 11:00:38 +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~26
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=4a852a001a4c47bf61991296458928e58affe02f

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

4a852a001a4c47bf61991296458928e58affe02f