From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 31 Aug 2016 15:35:42 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~60
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5b2d39b4a3fd1860ffb4874da9b73cd3436af79f;p=jalview.git

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

5b2d39b4a3fd1860ffb4874da9b73cd3436af79f