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

merge
---

ff856f8a3afb421a68f7f133851f3656e811fa3c