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

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

f2b86d72de53efb41fd1d57335fb0a61a9efe3ea