From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 7 Sep 2016 09:56:14 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~45^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d6a7a52ed783274ebf338417af48cd931cfba60e;p=jalview.git

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

d6a7a52ed783274ebf338417af48cd931cfba60e