From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 11 Nov 2016 14:02:39 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2295setChimeraAttributes
X-Git-Tag: Release_2_11_0~62^2~53
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d0df98277ba7e11e95d571f012fb371604ba0905;p=jalview.git

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

d0df98277ba7e11e95d571f012fb371604ba0905