From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 14 Jun 2016 11:31:34 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~179^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1b464022dd7d919df66738a517b3b46f8126ad98;p=jalview.git

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

1b464022dd7d919df66738a517b3b46f8126ad98