From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 26 Jun 2015 09:42:27 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~595^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6296524c4ccada42516aac9a85398170f5a3bc5d;p=jalview.git

merge
---

6296524c4ccada42516aac9a85398170f5a3bc5d