From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 29 Sep 2016 11:49:56 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~30
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=78c650c30d56b625a110e2cf5fdec93b9ff55e88;p=jalview.git

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

78c650c30d56b625a110e2cf5fdec93b9ff55e88