From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 2 Sep 2015 12:15:52 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~514
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8f6a276a88da8aa97fd31e1374f1fb9f2eee0918;p=jalview.git

merge
---

8f6a276a88da8aa97fd31e1374f1fb9f2eee0918