From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 29 Jan 2016 16:52:55 +0000 (+0000)
Subject: merge from develop
X-Git-Tag: Release_2_10_0~293^2~14
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ca18ad8c37003b01a5890bab14a0a7e80fd19e25;p=jalview.git

merge from develop
---

ca18ad8c37003b01a5890bab14a0a7e80fd19e25