From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 5 Oct 2015 10:44:07 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~373
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=47df71b2e12f6503e956705c9c9d9a7c14b5bd14;p=jalview.git

merge
---

47df71b2e12f6503e956705c9c9d9a7c14b5bd14