From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 26 Apr 2016 12:01:21 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~249
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=41555168f6feea9e3fe407bb2f79f115336e2136;p=jalview.git

merge
---

41555168f6feea9e3fe407bb2f79f115336e2136