From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 19 Apr 2017 14:07:39 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2435splitScreenFont
X-Git-Tag: Release_2_10_2~3^2~91^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e07868a6fa123b2ff79b7ccc2df7e96485168ec8;p=jalview.git

Merge branch 'develop' into features/JAL-2435splitScreenFont
---

e07868a6fa123b2ff79b7ccc2df7e96485168ec8