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

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

8a3759fdf8f9dad43e593856c1a0687beec22c1f