From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 3 Sep 2015 11:04:13 +0000 (+0100)
Subject: another merge from develop
X-Git-Tag: Release_2_10_0~475^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1fcd6eb366ba3d4c1a0f41c881ad6f6357be240f;p=jalview.git

another merge from develop
---

1fcd6eb366ba3d4c1a0f41c881ad6f6357be240f