From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 5 Dec 2016 09:05:26 +0000 (+0000)
Subject: Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes
X-Git-Tag: Release_2_11_0~62^2~36
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=afde3a03f7de3d246c7833cd77d62a603782c997

Merge branch 'features/JAL-1933_occupancy' into features/JAL-2295setChimeraAttributes
---

afde3a03f7de3d246c7833cd77d62a603782c997