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

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

76f97715b6ea0cd81f8b8176988e0b9b09a66a3d