From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 13 Jul 2016 10:28:11 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~142
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=29ebe6a3b9e43d41e967b993b84e1e86ab7ac040;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
---

29ebe6a3b9e43d41e967b993b84e1e86ab7ac040