From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 28 Mar 2016 14:37:00 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~278
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=123f569e5fd6c341c71e94a97e8ee1d042d10ba3;p=jalview.git

merge
---

123f569e5fd6c341c71e94a97e8ee1d042d10ba3