From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 27 May 2016 10:17:44 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~209
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ddcf4db31dc41b15dc21314cb6c85192d15bdf6c;p=jalview.git

merge
---

ddcf4db31dc41b15dc21314cb6c85192d15bdf6c