From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 18 May 2016 15:50:26 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~220
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ca15c06c7c05af6f540fdd2a6f9a8fb76f8ef76d;p=jalview.git

merge
---

ca15c06c7c05af6f540fdd2a6f9a8fb76f8ef76d