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

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

f9b93fde448013ee5e286edc413666129385e0d9