From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 8 Sep 2015 13:42:04 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~467
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1bdbfc9983a41b7872a61d56a9aa777b2b30ede5;p=jalview.git

merge
---

1bdbfc9983a41b7872a61d56a9aa777b2b30ede5