From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Fri, 14 Aug 2015 15:40:53 +0000 (+0100)
Subject: merge
X-Git-Tag: Release_2_10_0~541
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b683387108bab62bcab2bb45cb44b680bfbc5394;p=jalview.git

merge
---

b683387108bab62bcab2bb45cb44b680bfbc5394