From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 26 Apr 2016 16:42:45 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~247
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=743a0473c959092ec7c80bdb8169a541d33657cd;hp=-c;p=jalview.git

merge
---

743a0473c959092ec7c80bdb8169a541d33657cd