From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 17 Jan 2017 16:07:49 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2295setChimeraAttributes
X-Git-Tag: Release_2_11_0~62^2~32^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9d943c5feee75910c47704215a4363f25fecb859;p=jalview.git

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

9d943c5feee75910c47704215a4363f25fecb859