From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 10 Jun 2015 14:20:04 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~611^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=24b1a26ec167233d202778338f62471edcc0bacd;p=jalview.git

merge
---

24b1a26ec167233d202778338f62471edcc0bacd