From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 26 May 2016 13:05:02 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~212^2~4^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b2812af7b64b3ee81d0c5a50ff9a2cd0bcbd0de1;p=jalview.git

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

b2812af7b64b3ee81d0c5a50ff9a2cd0bcbd0de1