From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 14 Jun 2016 16:48:04 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~179
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=85246904e92e140d75830e191e7eb3e4467dac06;p=jalview.git

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

85246904e92e140d75830e191e7eb3e4467dac06