From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 26 May 2016 12:03:09 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~216
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e879efcd79694e43a8081c9235a13740cb429076;p=jalview.git

merge
---

e879efcd79694e43a8081c9235a13740cb429076