From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 30 May 2016 13:47:17 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~201
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6790716940a46f86f5670294c674eadf8ca6bccf;p=jalview.git

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

6790716940a46f86f5670294c674eadf8ca6bccf