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

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

ff186892e1107a35a2fb72dcccc806a6245f79ad