From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 22 Jun 2016 13:00:08 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~159^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7d5689aed049c21875c6976945a17ab3dd9d5667;p=jalview.git

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

7d5689aed049c21875c6976945a17ab3dd9d5667