From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 21 Jan 2016 12:45:30 +0000 (+0000)
Subject: merge
X-Git-Tag: Release_2_10_0~324
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=05e7a0e244f68d0c7c6e0e23d7c33c1f99f02eab;p=jalview.git

merge
---

05e7a0e244f68d0c7c6e0e23d7c33c1f99f02eab