From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 30 Nov 2016 10:48:35 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2295setChimeraAttributes
X-Git-Tag: Release_2_11_0~62^2~40
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=71efdade7739028c65e30e692bef81b4496d4c3d;p=jalview.git

Merge branch 'develop' into features/JAL-2295setChimeraAttributes
---

71efdade7739028c65e30e692bef81b4496d4c3d