From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 19 Jul 2016 11:49:48 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~138
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f642f166c0eeb010c9f5006d8450f83390924b8a;p=jalview.git

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

f642f166c0eeb010c9f5006d8450f83390924b8a