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

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

80fa1ace4f6ce0cea9680fd8a6d683270c8b2944