From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Thu, 14 Jul 2016 14:07:22 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_0~140
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=084a7f601520facb47a74c4c60fac0160b3a8047;p=jalview.git

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

084a7f601520facb47a74c4c60fac0160b3a8047