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

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

1cc528952178ccc8146a8235e3025c88fdb8f55f