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

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

8c04eddb0471d585f31292accfef12acf021b825