From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Wed, 15 Jun 2016 15:02:30 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~177
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=63e6fa9a792ca3b12c4bc580706f899f2b9aa532;p=jalview.git

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

63e6fa9a792ca3b12c4bc580706f899f2b9aa532