From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 28 Jul 2015 09:27:35 +0000 (+0100)
Subject: JAL-857 merge from develop
X-Git-Tag: Release_2_10_0~479^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=165e5fdcd9704bfd15243fbd41d33ca100383762;hp=-c;p=jalview.git

JAL-857 merge from develop
---

165e5fdcd9704bfd15243fbd41d33ca100383762