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

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

1070450e1afee97a5b4567416f5b7655fbfa59f1