From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 4 May 2016 11:58:26 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~230
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0c39d73b7bf2956bd0192d62ddc0abe48dbb32d8;p=jalview.git

merge
---

0c39d73b7bf2956bd0192d62ddc0abe48dbb32d8