From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 22 Nov 2016 12:48:30 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
X-Git-Tag: Release_2_10_1~10^2~6^2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=20af098edcc703a1b42bbb048fe315b2d18df22e;p=jalview.git

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

20af098edcc703a1b42bbb048fe315b2d18df22e