From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 1 Jul 2015 11:05:43 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-1759jmolUpdate
X-Git-Tag: Release_2_10_0~562^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2a36d880a6a221c6a46f4a24d10539073e40106d;p=jalview.git

Merge branch 'develop' into features/JAL-1759jmolUpdate
---

2a36d880a6a221c6a46f4a24d10539073e40106d