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

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

3ab17dd3059304edf244a2282504dc5b218ba268