From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 9 May 2016 16:48:10 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~227
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6bfc4c9617145a510ab16c67eac1a04cde35bf1d;p=jalview.git

merge
---

6bfc4c9617145a510ab16c67eac1a04cde35bf1d