From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 9 Feb 2016 16:57:16 +0000 (+0000)
Subject: merge develop
X-Git-Tag: Release_2_10_0~293^2~13
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a1de1a4351878df7cba243a3421c136b634d4d5f;p=jalview.git

merge develop
---

a1de1a4351878df7cba243a3421c136b634d4d5f