From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 7 Sep 2015 14:25:57 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~477^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2098a59fd8d77029fbbf8509a27926deb3d63c54;p=jalview.git

merge
---

2098a59fd8d77029fbbf8509a27926deb3d63c54